Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/ejweb/modules/front/sso/api/SsoController.java

+package com.ejweb.modules.front.sso.api;
+
+import com.ejweb.conf.ErrorCode;
+import com.ejweb.conf.GConstants;
+import com.ejweb.core.api.ResponseBean;
+import com.ejweb.core.base.BaseController;
+import com.ejweb.modules.front.sso.service.SsoService;
+import com.kingdee.eas.cp.eip.sso.ltpa.LtpaToken;
+import com.kingdee.eas.cp.eip.sso.ltpa.LtpaTokenManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.io.Resource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by zhangzn on 2017/09/13.
+ */
+
+@RestController
+@RequestMapping("/api/front/sso")
+public class SsoController extends BaseController {
+
+    @Autowired
+    private SsoService ssoService;
+
+    @RequestMapping(value = "/checkSso")
+    public ResponseBean checkSso(String token) {
+        ResponseBean response = new ResponseBean();
+        try {
+            DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
+            Resource resource = resourceLoader.getResource("LtpaToken.properties");
+            String filePath = resource.getURL().getPath();
+
+            LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
+            token = URLDecoder.decode(token);
+            token = URLDecoder.decode(token);
+            String username = "";
+            if (LtpaTokenManager.isValid(token)) {//验证Token是否合法有效
+                logger.debug(".................合法token：\t\t" + token);
+                LtpaToken ltpaToken = new LtpaToken(token);
+                username = ltpaToken.getUsername();
+            }
+            response.setStatus(ErrorCode.STATUS_CODE_2000);
+            response.setMessage("解析用户名正常");
+            if (ssoService.checkSso(username) == 1) {
+                response.setData(GConstants.YES);
+            } else {
+                response.setData(GConstants.NO);
+            }
+        } catch (Exception e) {
+            logger.error("解析用户名出错：\n" + e.getMessage());
+            response.setStatus(ErrorCode.STATUS_CODE_4001);
+            response.setMessage("解析用户名出错");
+            response.setData(e.getMessage());
+        }
+        return response;
+    }
+
+    @RequestMapping(value = "/test")
+    public ResponseBean test(String username) {
+        ResponseBean response = new ResponseBean();
+        try {
+            DefaultResourceLoader resourceLoader = new DefaultResourceLoader();
+            Resource resource = resourceLoader.getResource("LtpaToken.properties");
+            String filePath = resource.getURL().getPath();
+
+            LtpaTokenManager.loadConfig(URLDecoder.decode(URLDecoder.decode(filePath)));
+            response.setStatus(ErrorCode.STATUS_CODE_2000);
+            response.setMessage("ok");
+            response.setData(LtpaTokenManager.generate(username, URLDecoder.decode(URLDecoder.decode(filePath))));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error(e.getMessage());
+        }
+        return response;
+    }
+}

src/main/java/com/ejweb/modules/front/sso/dao/SsoDao.java

+package com.ejweb.modules.front.sso.dao;
+
+import com.ejweb.core.persistence.CrudDao;
+import com.ejweb.core.persistence.annotation.MyBatisDao;
+import com.ejweb.modules.front.sso.entity.SsoEntity;
+
+/**
+ * Created by zhangzn on 2017/09/13.
+ */
+@MyBatisDao
+public interface SsoDao extends CrudDao<SsoEntity> {
+
+    // 查找用户
+    int checkSso(String username);
+
+}

src/main/java/com/ejweb/modules/front/sso/entity/SsoEntity.java

+package com.ejweb.modules.front.sso.entity;
+
+import com.ejweb.core.persistence.DataEntity;
+
+/**
+ * Created by zhangzn on 2017/09/13.
+ */
+public class SsoEntity extends DataEntity<SsoEntity> {
+    private String username;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+}

src/main/java/com/ejweb/modules/front/sso/service/SsoService.java

+package com.ejweb.modules.front.sso.service;
+
+import com.ejweb.core.service.CrudService;
+import com.ejweb.modules.front.sso.dao.SsoDao;
+import com.ejweb.modules.front.sso.entity.SsoEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Created by zhangzn on 2017/09/13.
+ */
+
+@Service
+@Transactional(readOnly = true)
+public class SsoService extends CrudService<SsoDao, SsoEntity> {
+
+    // 添加举报信息
+    public int checkSso(String username) {
+        return dao.checkSso(username);
+    }
+}

src/main/resources/mappings/modules/front.sso/SsoDao.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ejweb.modules.front.sso.dao.SsoDao">
+
+    <select id="checkSso" resultType="Integer" parameterType="String">
+        SELECT
+            count(*)
+        FROM
+            sys_user su
+        WHERE
+            su.login_name = #{username}
+    </select>
+
+</mapper>
\ No newline at end of file

target/report_sunac/WEB-INF/classes/WEB-INF/web.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    version="2.5">
+         xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+         version="2.5">
   <display-name>JeeSite</display-name>
   <context-param>
     <param-name>contextConfigLocation</param-name>
@@ -131,6 +131,16 @@
     <filter-name>FileUploadFilter</filter-name>
     <url-pattern>/assets/ckfinder/core/connector/java/connector.java</url-pattern>
   </filter-mapping>
+  <filter>
+    <filter-name>CorsFilter</filter-name>
+    <filter-class>com.ejweb.core.filter.CORSFilter</filter-class>
+  </filter>
+
+  <filter-mapping>
+    <filter-name>CorsFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
   <servlet>
     <servlet-name>UserfilesDownloadServlet</servlet-name>
     <servlet-class>com.ejweb.core.servlet.UserfilesDownloadServlet</servlet-class>
@@ -145,8 +155,20 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>ValidateCodeServlet</servlet-name>
-    <url-pattern>/servlet/validateCodeServlet</url-pattern>
+    <url-pattern>/api/front/report/validateCodeServlet</url-pattern>
+  </servlet-mapping>
+
+
+  <!--验证码-->
+  <servlet>
+    <servlet-name>captcha</servlet-name>
+    <servlet-class>com.ejweb.modules.front.report.servlet.CaptchaServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>captcha</servlet-name>
+    <url-pattern>/api/front/report/captcha</url-pattern>
   </servlet-mapping>
+
   <error-page>
     <error-code>500</error-code>
     <location>/WEB-INF/views/error/500.jsp</location>

target/report_sunac/WEB-INF/classes/ejweb.properties

@@ -96,6 +96,9 @@ file.image.thumb.height=640
 # The Prefix Url
 file.prefix.url=http://127.0.0.1:8080/static/
 
+# The Prefix separator
+file.upload.path.separator = /
+
 # The Push Server Config
 push.server.url=http://123.56.146.81:1880/v1/
 

target/report_sunac/WEB-INF/classes/jdbc.properties

@@ -3,9 +3,9 @@ db.table.prefix=sunac_
 jdbc.type=mysql
 
 jdbc.driver.class=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost:3306/report_sunac?useUnicode=true&characterEncoding=utf-8
-jdbc.username=root
-jdbc.password=admin
+jdbc.url=jdbc:mysql://123.56.146.7:3306/sunac_report?useUnicode=true&characterEncoding=utf-8
+jdbc.username=reportuser
+jdbc.password=$R@20$7
 
 #初始化连接
 jdbc.initialSize=0