leader 提交

pom.xml

@@ -56,7 +56,7 @@
         <downloadSources>true</downloadSources>
 
     </properties>
-	
+
 	<!-- 设定仓库 -->
 	<repositories>
 		<repository>
@@ -94,7 +94,7 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-	
+
 		<repository>
 			<id>bitwalker.user-agent-utils.mvn.repo</id>
 			<url>https://nexus.jackpinetech.com/nexus/content/groups/public</url>
@@ -120,31 +120,31 @@
 			</resource>
 		</resources>
         <plugins>
-           
+
            <!-- tomcat6插件 -->
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat6-maven-plugin</artifactId>
-				<version>${tomcat.version}</version> 
+				<version>${tomcat.version}</version>
 				<configuration>
 					<port>${webserver.port}</port>
 					<path>/${project.artifactId}</path>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 				</configuration>
 			</plugin>
-			
+
 			<!-- tomcat7插件 -->
 			<plugin>
 				<groupId>org.apache.tomcat.maven</groupId>
 				<artifactId>tomcat7-maven-plugin</artifactId>
-				<version>${tomcat.version}</version> 
+				<version>${tomcat.version}</version>
 				<configuration>
 					<port>${webserver.port}</port>
 					<path>/${project.artifactId}</path>
 					<uriEncoding>${project.build.sourceEncoding}</uriEncoding>
 				</configuration>
 			</plugin>
-           
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -237,17 +237,17 @@
             <artifactId>spring-jdbc</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        
-        <!-- spring websocket--> 
-		<dependency>  
-           <groupId>org.springframework</groupId>  
-           <artifactId>spring-websocket</artifactId>  
-           <version>${spring.version}</version>  
-        </dependency>  
-        <dependency>  
-           <groupId>org.springframework</groupId>  
-           <artifactId>spring-messaging</artifactId>  
-           <version>${spring.version}</version>  
+
+        <!-- spring websocket-->
+		<dependency>
+           <groupId>org.springframework</groupId>
+           <artifactId>spring-websocket</artifactId>
+           <version>${spring.version}</version>
+        </dependency>
+        <dependency>
+           <groupId>org.springframework</groupId>
+           <artifactId>spring-messaging</artifactId>
+           <version>${spring.version}</version>
         </dependency>
 
         <!-- bean validate -->
@@ -387,7 +387,7 @@
             <artifactId>jsp-api</artifactId>
             <version>2.2</version>
             <scope>provided</scope>
-        </dependency>--> 
+        </dependency>-->
 
 
         <!-- J2CACHE begin -->
@@ -521,7 +521,7 @@
 			<artifactId>activiti-diagram-rest</artifactId>
 			<version>${activiti.version}</version>
 		</dependency>
-		
+
 		<!-- 支持activiti缓存 -->
 		<!-- <dependency>
 			<groupId>org.infinispan</groupId>
@@ -619,7 +619,7 @@
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
             <version>${fastjson.version}</version>
-        </dependency> 
+        </dependency>
 
         <!-- xstream xml -->
         <dependency>
@@ -697,7 +697,7 @@
             <systemPath>${lib.path}/batik-util-1.7.jar</systemPath>
             <scope>system</scope>
         </dependency>
-        
+
         <!-- quartz -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -732,7 +732,7 @@
 	        <version>2.6.2</version>
 	    </dependency>
 	    <!-- Echarts图表依赖包结束 -->
-		
+
         <!-- TEST begin -->
         <dependency>
             <groupId>junit</groupId>
@@ -783,7 +783,7 @@
             <systemPath>${lib.path}/QRCode.jar</systemPath>
             <scope>system</scope>
         </dependency>
-       
+
         <!-- UTILS begin -->
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -835,6 +835,16 @@
             <version>5.1.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>4.5</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.5</version>
+        </dependency>
 
     </dependencies>
 

src/main/java/com/jeeplus/common/config/Global.java

@@ -32,12 +32,12 @@ public class Global {
 	 * 当前对象实例
 	 */
 	private static Global global = new Global();
-	
+
 	/**
 	 * 保存全局属性值
 	 */
 	private static Map<String, String> map = Maps.newHashMap();
-	
+
 	/**
 	 * 属性文件加载对象
 	 */
@@ -54,13 +54,13 @@ public class Global {
 	 */
 	public static final String YES = "1";
 	public static final String NO = "0";
-	
+
 	/**
 	 * 对/错
 	 */
 	public static final String TRUE = "true";
 	public static final String FALSE = "false";
-	
+
 	/**
 	 * 上传文件基础虚拟路径
 	 */
@@ -71,7 +71,7 @@ public class Global {
 	 * @return
 	 */
 	public static String getShareBaseDir(){
-		String dir =  Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL  + "共享文档/";
+		String dir =  Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL  + "gxwj/";
 		FileUtils.createDirectory(dir);
 		return dir;
 	}
@@ -81,7 +81,7 @@ public class Global {
 	 */
 	public static String getShareBaseUrl(){
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL +  "/共享文档/";
+		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL +  "/gxwj/";
 	}
 
 	/**
@@ -90,7 +90,7 @@ public class Global {
 	 */
 	public static String getMyDocDir(){
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		String dir = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/我的文档/";
+		String dir = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/wdwd/";
 		FileUtils.createDirectory(dir);
 		return dir;
 	}
@@ -100,7 +100,7 @@ public class Global {
 	 */
 	public static String getMyDocUrl(){
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL + principal + "/我的文档/";
+		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL + principal + "/wdwd/";
 	}
 
 	/**
@@ -109,7 +109,7 @@ public class Global {
 	 */
 	public static String getAttachmentDir(){
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		String dir = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/程序附件/";
+		String dir = Global.getUserfilesBaseDir() + Global.USERFILES_BASE_URL + principal + "/cxfj/";
 		FileUtils.createDirectory(dir);
 		return dir;
 	}
@@ -121,7 +121,7 @@ public class Global {
 	public static String getAttachmentUrl(){
 
 		SystemAuthorizingRealm.Principal principal = (SystemAuthorizingRealm.Principal) UserUtils.getPrincipal();
-		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL + principal + "/程序附件/";
+		return  Servlets.getRequest().getContextPath() + Global.USERFILES_BASE_URL + principal + "/cxfj/";
 	}
 
 	/**
@@ -137,7 +137,7 @@ public class Global {
 	public static Global getInstance() {
 		return global;
 	}
-	
+
 	/**
 	 * 获取配置
 	 */
@@ -149,7 +149,7 @@ public class Global {
 		}
 		return value;
 	}
-	
+
 	/**
 	 * 获取管理端根路径
 	 */
@@ -164,21 +164,21 @@ public class Global {
 	public static String getDefaultTheme() {
 		return getConfig("defaultTheme");
 	}
-	
+
 	/**
 	 * 获取前端根路径
 	 */
 	public static String getFrontPath() {
 		return getConfig("frontPath");
 	}
-	
+
 	/**
 	 * 获取URL后缀
 	 */
 	public static String getUrlSuffix() {
 		return getConfig("urlSuffix");
 	}
-	
+
 	/**
 	 * 是否是演示模式，演示模式下不能修改用户、角色、密码、菜单、授权
 	 */
@@ -186,7 +186,7 @@ public class Global {
 		String dm = getConfig("demoMode");
 		return "true".equals(dm) || "1".equals(dm);
 	}
-	
+
 	/**
 	 * 在修改系统用户和角色时是否同步到Activiti
 	 */
@@ -194,7 +194,7 @@ public class Global {
 		String dm = getConfig("activiti.isSynActivitiIndetity");
 		return "true".equals(dm) || "1".equals(dm);
 	}
-    
+
 	/**
 	 * 页面获取常量
 	 */
@@ -222,7 +222,7 @@ public class Global {
 //		System.out.println("userfiles.basedir: " + dir);
 		return dir;
 	}
-	
+
     /**
      * 获取工程路径
      * @return
@@ -254,10 +254,10 @@ public class Global {
 		}
 		return projectPath;
     }
-    
+
     /**
 	 * 写入properties信息
-	 * 
+	 *
 	 * @param key
 	 *            名称
 	 * @param value
@@ -277,7 +277,7 @@ public class Global {
 			e.printStackTrace();
 		}
 	}
-	
+
 	/**
 	 * 返回　Properties
 	 * @param
@@ -294,5 +294,5 @@ public class Global {
 		return prop;
 	}
 
-	
+
 }

src/main/java/com/jeeplus/modules/sys/web/FileController.java

@@ -43,7 +43,7 @@ public class FileController extends BaseController {
 		FileUtils.createDirectory(Global.getMyDocDir());
 		FileUtils.createDirectory(Global.getShareBaseDir());
 	}
-	
+
 	/**
 	 * 文件管理列表页面
 	 */
@@ -53,7 +53,7 @@ public class FileController extends BaseController {
 		init();
 		return "modules/sys/file/fileManager";
 	}
-	
+
 		/**
 	 * 文件管理列表数据
 	 */
@@ -326,6 +326,9 @@ public class FileController extends BaseController {
 			file.transferTo(newFile);
 			j.put("id", newFile.getAbsolutePath());
 			j.put("url", fileUrl+ newFile.getName());
+			Map map = new HashMap();
+			map.put("fileUrl",fileDir);
+			HttpResponse.doPostFile2("http://localhost:8089/upload/",map,newFile);
 		}
 		return j;
 	}
@@ -347,7 +350,7 @@ public class FileController extends BaseController {
 
 		return j;
 	}
-	
 
 
-}
+
+}

src/main/java/com/jeeplus/modules/sys/web/HttpResponse.java

@@ -0,0 +1,77 @@
+package com.jeeplus.modules.sys.web;
+
+import org.apache.http.Consts;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.mime.HttpMultipartMode;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.Map;
+
+/**
+ * @author wang_xy
+ * @description
+ * @Version 1.0
+ * @params
+ * @return
+ * @since 2022/9/15 10:22
+ */
+public class HttpResponse {
+
+    public static String doPostFile2(String url, Map<String, String> param, File file) {
+        // 创建Httpclient对象
+        CloseableHttpClient httpClient = HttpClients.createDefault();
+        String resultString = "";
+        CloseableHttpResponse response = null;
+        HttpPost httppost = new HttpPost(url);
+        try {
+            // HttpMultipartMode.RFC6532参数的设定是为避免文件名为中文时乱码
+            MultipartEntityBuilder builder = MultipartEntityBuilder.create().setMode(HttpMultipartMode.RFC6532);
+            // 设置请求的编码格式
+            builder.setCharset(Consts.UTF_8);
+            builder.setContentType(ContentType.MULTIPART_FORM_DATA);
+            // 添加文件,也可以添加字节流
+			builder.addBinaryBody("file", file);
+            //或者使用字节流也行,根据具体需要使用
+//            builder.addBinaryBody("file", Files.readAllBytes(file.toPath()),ContentType.APPLICATION_OCTET_STREAM,file.getName());
+//             或者builder.addPart("file",new FileBody(file));
+            // 添加参数
+            if (param != null) {
+                for (String key : param.keySet()) {
+                    builder.addTextBody(key, param.get(key));
+                }
+            }
+            HttpEntity reqEntity = builder.build();
+            httppost.setEntity(reqEntity);
+            // 设置超时时间
+            httppost.setConfig(getConfig());
+            response = httpClient.execute(httppost);
+            resultString = EntityUtils.toString(response.getEntity(), "GBK");
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.close();
+            } catch (IOException e) {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return resultString;
+    }
+
+    private static RequestConfig getConfig() {
+        return RequestConfig.custom().setConnectionRequestTimeout(60000).setSocketTimeout(120000)
+                .setConnectTimeout(60000).build();
+    }
+}

src/main/resources/j2cache/j2cache.properties

@@ -88,9 +88,9 @@ redis.cluster_name = j2cache
 redis.namespace =
 
 ## connection 127.0.0.1
-redis.hosts = localhost:6379
+redis.hosts = localhost:16379
 redis.timeout = 2000
-redis.password =
+redis.password = edyj123456
 redis.database = 3
 
 ## redis pool properties

src/main/resources/properties/jeeplus.properties

@@ -5,9 +5,9 @@
 #mysql database setting
 jdbc.type=mysql
 jdbc.driver=com.mysql.jdbc.Driver 
-jdbc.url=jdbc:mysql://117.78.49.164:53306/leader_db_product?useUnicode=true&characterEncoding=utf-8
-jdbc.username=yanshi
-jdbc.password=yanshi123456
+jdbc.url=jdbc:mysql://192.168.0.144:3306/jian_leader_db_product?useUnicode=true&characterEncoding=utf-8
+jdbc.username=root
+jdbc.password=123456
 jdbc.testSql=SELECT 'x'
 jdbc.dual =
 
@@ -20,91 +20,92 @@ jdbc.pool.maxActive=20
 #===== System settings ======#
 #============================#
 
-#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
-productName= \u57fa\u5c42\u515a\u5efa\u7ba1\u7406\u5e73\u53f0
+#\u4EA7\u54C1\u4FE1\u606F\u8BBE\u7F6E
+productName= \u57FA\u5C42\u515A\u5EFA\u7BA1\u7406\u5E73\u53F0
 copyrightYear=2019
 version=v1.0
 
 #\u9ED8\u8BA4\u4E3B\u9898(\u53EF\u9009\u503C jp\uFF0Cdefault\uFF0C  jp\u662F\u9ED8\u8BA4\u6A2A\u5411\u83DC\u5355\uFF0Cdefault\u9ED8\u8BA4\u662F\u5DE6\u4FA7\u83DC\u5355\u7ECF\u5178\u98CE\u683C)
 defaultTheme = jp
 
-#\u6f14\u793a\u6a21\u5f0f: \u4e0d\u80fd\u64cd\u4f5c\u548c\u4fdd\u5b58\u7684\u6a21\u5757\uff1a sys: area/office/user/role/menu/dict, cms: site/category
+#\u6F14\u793A\u6A21\u5F0F: \u4E0D\u80FD\u64CD\u4F5C\u548C\u4FDD\u5B58\u7684\u6A21\u5757\uFF1A sys: area/office/user/role/menu/dict, cms: site/category
 demoMode=false
 
-#\u7ba1\u7406\u57fa\u7840\u8def\u5f84, \u9700\u540c\u6b65\u4fee\u6539\uff1aweb.xml
+#\u7BA1\u7406\u57FA\u7840\u8DEF\u5F84, \u9700\u540C\u6B65\u4FEE\u6539\uFF1Aweb.xml
 adminPath=/a
 
-#\u524d\u7aef\u57fa\u7840\u8def\u5f84 web
+#\u524D\u7AEF\u57FA\u7840\u8DEF\u5F84 web
 frontPath=/a
 
-#\u7f51\u7ad9URL\u540e\u7f00
+#\u7F51\u7AD9URL\u540E\u7F00
 urlSuffix=.html
 
-#\u662f\u5426\u4e0d\u5141\u8bb8\u5237\u65b0\u4e3b\u9875\uff0c\u4e0d\u5141\u8bb8\u60c5\u51b5\u4e0b\uff0c\u5237\u65b0\u4e3b\u9875\u4f1a\u5bfc\u81f4\u91cd\u65b0\u767b\u5f55
+#\u662F\u5426\u4E0D\u5141\u8BB8\u5237\u65B0\u4E3B\u9875\uFF0C\u4E0D\u5141\u8BB8\u60C5\u51B5\u4E0B\uFF0C\u5237\u65B0\u4E3B\u9875\u4F1A\u5BFC\u81F4\u91CD\u65B0\u767B\u5F55
 notAllowRefreshIndex=false
 
-#\u662f\u5426\u5141\u8bb8\u591a\u8d26\u53f7\u540c\u65f6\u767b\u5f55
+#\u662F\u5426\u5141\u8BB8\u591A\u8D26\u53F7\u540C\u65F6\u767B\u5F55
 user.multiAccountLogin=true
 
-#\u5206\u9875\u914d\u7f6e
+#\u5206\u9875\u914D\u7F6E
 page.pageSize=20
 
-#\u7855\u6b63\u7ec4\u4ef6\u662f\u5426\u4f7f\u7528\u7f13\u5b58
+#\u7855\u6B63\u7EC4\u4EF6\u662F\u5426\u4F7F\u7528\u7F13\u5B58
 supcan.useCache=false
 
-#\u901a\u77e5\u95f4\u9694\u65f6\u95f4\u8bbe\u7f6e, \u5355\u4f4d\uff1a\u6beb\u79d2, 30s=30000ms, 60s=60000ms
+#\u901A\u77E5\u95F4\u9694\u65F6\u95F4\u8BBE\u7F6E, \u5355\u4F4D\uFF1A\u6BEB\u79D2, 30s=30000ms, 60s=60000ms
 oa.notify.remind.interval=60000
 
 #============================#
 #==== Framework settings ====#
 #============================#
 
-#\u4f1a\u8bdd\u8d85\u65f6\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
+#\u4F1A\u8BDD\u8D85\u65F6\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C 20m=1200000ms, 30m=1800000ms, 60m=3600000ms
 session.sessionTimeout=1800000
-#\u4f1a\u8bdd\u6e05\u7406\u95f4\u9694\u65f6\u95f4\uff0c \u5355\u4f4d\uff1a\u6beb\u79d2\uff0c2m=120000ms\u3002
+#\u4F1A\u8BDD\u6E05\u7406\u95F4\u9694\u65F6\u95F4\uFF0C \u5355\u4F4D\uFF1A\u6BEB\u79D2\uFF0C2m=120000ms\u3002
 session.sessionTimeoutClean=120000
 
-#\u7d22\u5f15\u9875\u8def\u5f84
+#\u7D22\u5F15\u9875\u8DEF\u5F84
 web.view.index=/a
 
-#\u89c6\u56fe\u6587\u4ef6\u5b58\u653e\u8def\u5f84
+#\u89C6\u56FE\u6587\u4EF6\u5B58\u653E\u8DEF\u5F84
 web.view.prefix=/webpage/
 web.view.suffix=.jsp
 
 #\u6587\u4EF6\u7BA1\u7406\u7CFB\u7EDF\u5141\u8BB8\u4E0A\u4F20\u7684\u6700\u5927\u6587\u4EF6
 web.maxUploadSize=1073741824
 
-#\u65e5\u5fd7\u62e6\u622a\u8bbe\u7f6e\uff0c\u6392\u9664\u7684URI\uff1b\u5305\u542b @RequestMapping\u6ce8\u89e3\u7684value\u3002\uff08\u5df2\u4f5c\u5e9f\uff09
+#\u65E5\u5FD7\u62E6\u622A\u8BBE\u7F6E\uFF0C\u6392\u9664\u7684URI\uFF1B\u5305\u542B @RequestMapping\u6CE8\u89E3\u7684value\u3002\uFF08\u5DF2\u4F5C\u5E9F\uFF09
 #web.logInterceptExcludeUri=/, /login, /sys/menu/treeData, /oa/oaNotify/self/count
 #web.logInterceptIncludeRequestMapping=save, delete, import, updateSort
 
-#\u9759\u6001\u6587\u4ef6\u540e\u7f00
+#\u9759\u6001\u6587\u4EF6\u540E\u7F00
 web.staticFile=.css,.js,.png,.jpg,.gif,.jpeg,.bmp,.ico,.swf,.psd,.htc,.htm,.html,.crx,.xpi,.exe,.ipa,.apk
 
-#\u5355\u70b9\u767b\u5f55CAS\u8bbe\u7f6e
+#\u5355\u70B9\u767B\u5F55CAS\u8BBE\u7F6E
 cas.server.url=http://127.0.0.1:8180/cas
 cas.project.url=http://127.0.0.1:8080/
 
-#\u5de5\u4f5c\u6d41\u8bbe\u7f6e
+#\u5DE5\u4F5C\u6D41\u8BBE\u7F6E
 activiti.isSynActivitiIndetity=false
 activiti.export.diagram.path=c:/activiti_diagram
-#activiti font (windows font: \u5b8b\u4f53  linux font: simsun)
-activiti.diagram.activityFontName=\u5b8b\u4f53
-activiti.diagram.labelFontName=\u5b8b\u4f53
-#activiti\u5916\u90e8\u8868\u5355\u6839\u5730\u5740\u914d\u7f6e
+#activiti font (windows font: \u5B8B\u4F53  linux font: simsun)
+activiti.diagram.activityFontName=\u5B8B\u4F53
+activiti.diagram.labelFontName=\u5B8B\u4F53
+#activiti\u5916\u90E8\u8868\u5355\u6839\u5730\u5740\u914D\u7F6E
 activiti.form.server.url=
 
-#\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
-#userfiles.basedir=C:/leaderAttach
-userfiles.basedir=/home/wxy/upload/leaderAttach
+#\u4E0A\u4F20\u6587\u4EF6\u7EDD\u5BF9\u8DEF\u5F84, \u8DEF\u5F84\u4E2D\u4E0D\u5141\u8BB8\u5305\u542B\u201Cuserfiles\u201D
+userfiles.basedir=D:/home/wxy/upload/leaderAttach
+#userfiles.basedir=/home/wxy/upload/leaderAttach
 projectPath=/home/wxy/upload/project
+
 #======================================#\u6587\u4EF6\u4E0A\u4F20\u9650\u5236#======================================#
 spring.http.multipart.max-file-size=100MB
 spring.http.multipart.max-request-size=100MB
 #\u6388\u6743\u57DF\u540D
 domain.url=
 
-#=========֤=============
+#=========\u05A4=============
 #http short message
 sms.http=http://61.191.26.189:8888/smser.ashx
 

src/main/webapp/static/web/djyt/images/ja_dj.css

@@ -427,14 +427,14 @@ c img {
 	line-height: 39px;
 	letter-spacing: 1px;
 }
-.map_tk {
-    background: url(tkbg.png) no-repeat center;
-    width: 299px;
-    height: 137px;
-    color: #fff;
-    position: absolute;
-    z-index: 9;
-    padding: 50px 50px;
+.map_tk{
+	background: url(tkbg.png) no-repeat center;
+	width: 358px;
+	height: 226px;
+	color: #fff;
+	position: absolute;
+	z-index: 9;
+	padding: 33px 35px;
 	display: none;
 }
 .map_tk h2{
@@ -448,86 +448,94 @@ c img {
 	line-height: 20px;
 }
 #tdj{
-	position: absolute;
-	width: 160px;
-	height: 95px;
-	 cursor: pointer;
-	top: 78px;
-	left: 802px;
-	z-index: 1;
+	position:absolute;
+	width:160px;
+	height:95px;
+	cursor:pointer;
+	top:74px;
+	left:709px;
+	z-index:1;
 }
 #qhz{
 	position: absolute;
 	width: 160px;
 	height: 95px;
-	 cursor: pointer;
-	top: 178px;
-	left: 875px;z-index: 1;
+	cursor: pointer;
+	top: 154px;
+	left: 750px;
+	z-index: 1;
 }
 #cyz{
 	position: absolute;
 	width: 160px;
 	height: 95px;
-	 cursor: pointer;
-	top: 305px;
-	left: 644px;z-index: 1;
+	cursor: pointer;
+	top: 268px;
+	left: 584px;
+	z-index: 1;
 }
 #hdz{
 	position: absolute;
-	    width: 121px;
-	    height: 77px;
-	     cursor: pointer;
-	    top: 405px;
-	    left: 725px;z-index: 1;
+	width: 121px;
+	height: 77px;
+	cursor: pointer;
+	top: 335px;
+	left: 656px;
+	z-index: 1;
 }
 #tsz{
 	position: absolute;
-	    width: 121px;
-	    height: 77px;
-	     cursor: pointer;
-	    top: 425px;
-	    left: 855px;z-index: 1;
+	width: 121px;
+	height: 77px;
+	cursor: pointer;
+	top: 295px;
+	left: 711px;
+	z-index: 1;
 }
 #dlz{
 	position: absolute;
-	    width: 141px;
-	    height: 100px;
-	    cursor: pointer;
-	    bottom: 155px;
-	    left: 744px;z-index: 1;
+	width: 141px;
+	height: 100px;
+	cursor: pointer;
+	bottom: 131px;
+	left: 649px;
+	z-index: 1;
 }
 #ylz{
 	position: absolute;
-	    width: 115px;
-	    height: 72px;
-	     cursor: pointer;
-	    bottom: 231px;
-	    left: 902px;z-index: 1;
+	width: 115px;
+	height: 72px;
+	cursor: pointer;
+	bottom: 169px;
+	left: 775px;
+	z-index: 1;
 }
 #lsx{
 	position: absolute;
-	    width: 115px;
-	    height: 72px;
-	     cursor: pointer;
-	    bottom: 75px;
-	    left: 800px;z-index: 1;
+	width: 115px;
+	height: 72px;
+	cursor: pointer;
+	bottom: 75px;
+	left: 735px;
+	z-index: 1;
 }
 #jas{
 	position: absolute;
-	    width: 115px;
-	    height: 72px;
-	     cursor: pointer;
-	    bottom: 344px;
-	    right: 690px;z-index: 1;
+	width: 115px;
+	height: 72px;
+	cursor: pointer;
+	bottom: 283px;
+	right: 613px;
+	z-index: 1;
 }
 #twz{
 	position: absolute;
-	    width: 63px;
-	    height: 45px;
-	   cursor: pointer;
-	    bottom: 419px;
-	    right: 655px;z-index: 1;
-		
+	width: 63px;
+	height: 45px;
+	cursor: pointer;
+	bottom: 369px;
+	right: 577px;
+	z-index: 1;
 }
 .tdj{
 	top: -46px;

src/main/webapp/webpage/modules/leader/cloudChart/cloudChart.jsp

@@ -16,65 +16,65 @@
 </div>
 <div class="map">
 	<div id="tdj" class="map_div"><div class="map_tk tdj">
-		<h2>头道镇机关党工委</h2>
+		<h2>头道镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：头道镇机关党工委</p>
+		<p>部门名称：头道镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="qhz" class="map_div"><div class="map_tk qhz">
-		<h2>清河镇机关党工委</h2>
+		<h2>清河镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：清河镇机关党工委</p>
+		<p>部门名称：清河镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="cyz" class="map_div"><div class="map_tk cyz">
-		<h2>财源镇机关党工委</h2>
+		<h2>财源镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：财源镇机关党工委</p>
+		<p>部门名称：财源镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="hdz" class="map_div"><div class="map_tk hdz">
-		<h2>花甸镇机关党工委</h2>
+		<h2>花甸镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：花甸镇机关党工委</p>
+		<p>部门名称：花甸镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="tsz" class="map_div"><div class="map_tk tsz">
-		<h2>台上镇机关党工委</h2>
+		<h2>台上镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：台上镇机关党工委</p>
+		<p>部门名称：台上镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="dlz" class="map_div"><div class="map_tk dlz">
-		<h2>大路镇机关党工委</h2>
+		<h2>大路镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：大路镇机关党工委</p>
+		<p>部门名称：大路镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="ylz" class="map_div"><div class="map_tk lsx">
-		<h2>榆林镇机关党工委</h2>
+		<h2>榆林镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：榆林镇机关党工委</p>
+		<p>部门名称：榆林镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="lsx" class="map_div"><div class="map_tk lsx">
-		<h2>凉水朝鲜族乡机关党工委</h2>
+		<h2>凉水朝鲜族乡机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：凉水朝鲜族乡机关党工委</p>
+		<p>部门名称：凉水朝鲜族乡机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>
@@ -88,9 +88,9 @@
 		<p>直属机构：是</p>
 	</div></div>
 	<div id="twz" class="map_div"><div class="map_tk twz">
-		<h2>太王镇机关党工委</h2>
+		<h2>太王镇机关党委</h2>
 		<p>上级党委名称：集安市委</p>
-		<p>部门名称：太王镇机关党工委</p>
+		<p>部门名称：太王镇机关党委</p>
 		<p>党组织类型：中共县级委员会派出工作委员会</p>
 		<p>党组织性质：是</p>
 		<p>直属机构：是</p>

src/main/webapp/webpage/modules/sys/login/sysLogin.jsp

@@ -41,7 +41,7 @@
 	<body>
 
 
-		<div class="login-page" style="display: none;">
+		<div class="login-page">
 		<div class="row">
 			<div class="col-md-4 col-lg-4 col-md-offset-4 col-lg-offset-4">
 				<img  class="img-circle" src="${ctxStatic}/common/images/flat-avatar.png" class="user-avatar" />
@@ -129,7 +129,7 @@ $(function(){
 		$('.theme-picker').click(function() {
 			changeTheme($(this).attr('data-theme'));
 		});
-        $("#dl").click();
+        // $("#dl").click();
 });
 
 function changeTheme(theme) {