【众志祥EIS】

src/main/java/com/uas/eis/config/PDMConfig.java

@@ -1,17 +0,0 @@
-package com.uas.eis.config;
-
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-
-@Configuration
-@PropertySource("classpath:pdm.properties")
-@Data
-public class PDMConfig {
-    @Value("${user_name}")
-    private String user_name;
-
-    @Value("${password}")
-    private String password;
-}

src/main/java/com/uas/eis/controller/ERPController.java

@@ -6,6 +6,7 @@ import com.uas.eis.service.ERPService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -14,14 +15,17 @@ import java.util.Map;
  * @date 2025-11-14
  */
 @RestController
+@RequestMapping("/api")
 public class ERPController {
     @Autowired
     private ERPService erpService;
-
-    @RequestMapping(value="/mesapi/dev/query",method=RequestMethod.POST)
+    @RequestMapping(value="/queryList",method=RequestMethod.POST)
     @ResponseBody
-    public Map<String,Object> queryFromDev(@RequestBody QueryReq queryReq){
-        return erpService.getList(queryReq,"dev");
+    public Map<String,Object> queryList(@RequestBody QueryReq queryReq){
+        Map<String,Object> res = new HashMap<>();
+        res.put("code", 0);
+        res.put("msg", "ok");
+        return res;
     }
 
     @RequestMapping(value="/mesapi/prod/query",method=RequestMethod.POST)

src/main/java/com/uas/eis/core/WebAppConfig.java

@@ -3,7 +3,6 @@ package com.uas.eis.core;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.uas.eis.core.support.ApiSignLoginInterceptor;
 import com.uas.eis.core.support.DataSourceInterceptor;
-import com.uas.eis.core.support.InterceptorConfig;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.converter.HttpMessageConverter;
@@ -25,14 +24,10 @@ public class WebAppConfig extends WebMvcConfigurationSupport{
 		return new ApiSignLoginInterceptor();
 	}
 
-	@Bean
-	public InterceptorConfig interceptorConfig(){
-		return new InterceptorConfig();
-	}
 
 	@Override
 	public void addInterceptors(InterceptorRegistry registry){
-		registry.addInterceptor(interceptorConfig()).addPathPatterns("/api/**","/mes/**")
+		registry.addInterceptor(apiSignLoginInterceptor()).addPathPatterns("/api/**","/mes/**")
 				.excludePathPatterns("/login", "/erp/**", "/mesapi/**");
 		registry.addInterceptor(new DataSourceInterceptor()).addPathPatterns("/*/**");
 	}

src/main/java/com/uas/eis/core/support/ApiSignLoginInterceptor.java

@@ -31,8 +31,15 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-
-       /* String timestamp = request.getHeader(TIMESTAMP_KEY);
+        logger.info(String.format("Content-Type:%s,URI:%s,Header:%s,bodyparam:%s"
+                        ,request.getRequestURI()
+                        ,request.getHeader("Content-Type")
+                        ,"stamp{"+request.getHeader(TIMESTAMP_KEY)+"},ACCESS_KEY{"+request.getHeader(ACCESS_KEY)+"},RequestId{"+request.getHeader(RequestId)
+                                +"},sign{"+request.getHeader(SIGN_KEY)+"}"
+                        , request.getInputStream().toString()
+                )
+        );
+        String timestamp = request.getHeader(TIMESTAMP_KEY);
         String accessKey = request.getHeader(ACCESS_KEY);
         String requestId = request.getHeader(RequestId);
         String originSign = request.getHeader(SIGN_KEY);
@@ -82,7 +89,7 @@ public class ApiSignLoginInterceptor extends HandlerInterceptorAdapter {
             apiResult.setMessage(ErrorMessage.SIGNATURE_ILLEGAL.getMessage());
             apiResult.setRequestId(requestId);
             throw new ApiSystemException(apiResult);
-        }*/
+        }
         return true;
     }
 

src/main/java/com/uas/eis/core/support/InterceptorConfig.java

@@ -1,65 +0,0 @@
-package com.uas.eis.core.support;
-
-import com.uas.eis.entity.ErrorMessage;
-import com.uas.eis.exception.ApiSystemException;
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.service.UserService;
-import io.jsonwebtoken.Claims;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
-
-public class InterceptorConfig implements HandlerInterceptor {
-
-	@Autowired
-	private UserService userService;
-
-	private final static String header = "Authorization";
-
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-		//token认证
-		String token = request.getHeader(header);
-		boolean flag = false;
-		if(token != null && !token.trim().isEmpty()) { // 验证是否包含token
-			Claims claims = TokenHandler.parseToken(token);
-			if(claims != null && checkToken(claims)) { // 验证token信息是否合法
-				String username = (String) claims.get("username");
-				String password = (String) claims.get("password");
-				userService.checkUser(username, password);
-				flag = true;
-			}
-		}
-		if(!flag){
-			ApiResult apiResult = new ApiResult();
-			apiResult.setCode(ErrorMessage.TOKEN_ILLEGAL.getCode());
-			apiResult.setMessage(ErrorMessage.TOKEN_ILLEGAL.getMessage());
-			apiResult.setRequestId(null);
-			throw new ApiSystemException(apiResult);
-		}
-		return flag;
-	}
-
-	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler,
-			ModelAndView modelAndView) throws Exception {
-	}
-
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler,
-			Exception ex) throws Exception {
-	}
-
-	private boolean checkToken(Claims claims) {
-		Date now = new Date();
-		Date start = claims.getNotBefore();
-		Date end = claims.getExpiration();
-
-		boolean flag = false;
-		if (now.after(start) && now.before(end)) {
-			flag = true;
-		}
-		return flag;
-	}
-}

src/main/java/com/uas/eis/entity/ErrorMessage.java

@@ -9,9 +9,12 @@ import java.util.Objects;
 public enum ErrorMessage {
     SYS_ILLEGAL("0001","请求异常"),
     TOKEN_ILLEGAL("1001","token不合法"),
-    USERNAME_IS_EMPTY("1002","用户账号为空"),
-    USERNAME_ILLEGAL("1003","用户账号不存在"),
-    PWD_IS_EMPTY("1004","用户密码为空"),
+    TIMESTAMP_ILLEGAL("1001","请求时间戳不合法"),
+    ACCESSKEY_ILLEGAL("1002","加密KEY不合法"),
+    TIMEOUT_ILLEGAL("1003","请求超时"),
+    REQUESTID_ILLEGAL("1004","随机字符串不合法"),
+    SIGNATURE_ILLEGAL("1005","签名错误"),
+    PWD_IS_EMPTY("1006","用户密码为空"),
     PWD_ILLEGAL("1005","用户密码不正确"),
     BUSINESS_ILLEGAL("2001","业务异常");
 

src/main/java/com/uas/eis/sdk/dto/QueryListReq.java

@@ -0,0 +1,22 @@
+package com.uas.eis.sdk.dto;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class QueryListReq {
+    private String code; //表单名称
+    @JsonProperty("FieldKeys")
+    private String fieldKeys; //字段名
+    @JsonProperty("FilterString")
+    private String filterString; //过滤条件
+    @JsonProperty("OrderString")
+    private String orderString; //排序条件
+    @JsonProperty("TopRowCount")
+    private Integer topRowCount = 0; //返回记录行数，0 不限制
+    @JsonProperty("StartRow")
+    private Integer startRow = 0; //起始行数（分页显示用） 0 默认从第一行记录
+    @JsonProperty("Limit")
+    private Integer limit = 2000; //最多行数 默认2000
+}

src/main/java/com/uas/eis/service/Impl/UserServiceImpl.java

@@ -1,50 +0,0 @@
-package com.uas.eis.service.Impl;
-
-import com.uas.eis.config.PDMConfig;
-import com.uas.eis.entity.ErrorMessage;
-import com.uas.eis.exception.ApiSystemException;
-import com.uas.eis.sdk.entity.ApiResult;
-import com.uas.eis.service.UserService;
-import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class UserServiceImpl implements UserService {
-    @Autowired
-    private PDMConfig pdmConfig;
-
-    @Override
-    public boolean checkUser(String username, String password) {
-        if (StringUtils.isEmpty(username)) {
-            ApiResult apiResult = new ApiResult();
-            apiResult.setCode(ErrorMessage.USERNAME_IS_EMPTY.getCode());
-            apiResult.setMessage(ErrorMessage.USERNAME_IS_EMPTY.getMessage());
-            apiResult.setRequestId(null);
-            throw new ApiSystemException(apiResult);
-        }
-        if (StringUtils.isEmpty(password)) {
-            ApiResult apiResult = new ApiResult();
-            apiResult.setCode(ErrorMessage.PWD_IS_EMPTY.getCode());
-            apiResult.setMessage(ErrorMessage.PWD_IS_EMPTY.getMessage());
-            apiResult.setRequestId(null);
-            throw new ApiSystemException(apiResult);
-        }
-        if(!username.equals(pdmConfig.getUser_name())){
-            ApiResult apiResult = new ApiResult();
-            apiResult.setCode(ErrorMessage.USERNAME_ILLEGAL.getCode());
-            apiResult.setMessage(ErrorMessage.USERNAME_ILLEGAL.getMessage());
-            apiResult.setRequestId(null);
-            throw new ApiSystemException(apiResult);
-        }
-        if(!password.equals(pdmConfig.getPassword())){
-            ApiResult apiResult = new ApiResult();
-            apiResult.setCode(ErrorMessage.PWD_ILLEGAL.getCode());
-            apiResult.setMessage(ErrorMessage.PWD_ILLEGAL.getMessage());
-            apiResult.setRequestId(null);
-            throw new ApiSystemException(apiResult);
-        }
-        return true;
-    }
-
-}

src/main/java/com/uas/eis/service/UserService.java

@@ -1,6 +0,0 @@
-package com.uas.eis.service;
-
-
-public interface UserService {
-    boolean checkUser(String username, String password);
-}

src/main/resources/application-prod.yml

@@ -2,7 +2,7 @@ spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: oracle.jdbc.OracleDriver
-        username: N_DGMT
+        username: ZZX_DATACENTER
         password: select!#%*(
         url: jdbc:oracle:thin:@127.0.0.1:1521:orcl
         initialSize: 1
@@ -22,30 +22,10 @@ server:
     tomcat:
         uri_encoding: UTF-8
     context-path:
-        /API
+        /ERPAPI
     port: 8186
 action:
-    api_action: /EIS/api,/EIS/mes,/EIS/erp
-    public_actions: /EIS/logout,/EIS/hello1
+    api_action: /ERPAPI/api,/ERPAPI/mes,/ERPAPI/erp
+    public_actions: /ERPAPI/logout,/ERPAPI/hello1
 
-STK:
-    s_org_code: 5418
-    app_id: bf00be8b_0387_44f4_b073_50c3c2d6
-    app_key: eb1b6053bdda437c98a93d93013d9fae
-    #获取客商信息接口编码
-    get_travelling_merchant: vhtITAFq
-    #获取客商状态反馈信息接口编码
-    get_travelling_merchant_status: WT3uRr4V
-    #自动化查询接口
-    query_url: https://192.168.2.179/api/oapigw/api/oapisvc/automicApi/
-    #自动化新增或变更类接口地址
-    save_or_update_url: http://192.168.2.179/api/oapigw/api/oapisvc/automicUpsertApi/
-    #复杂查询接口地址
-    complexity_query_url: https://192.168.2.179/api/oapigw/api/oapisvc/api/v2/search
 
-    #新增修改客商信息接口编码
-    save_or_update_request_code: 18c60d85eb0646a080341b64310109f1
-    #现金流量项目查询方法编码
-    cash_flow_items_request_code: 89edb885a8cf4412b870233fc89fb381
-    #会计科目查询方法code
-    accountant_project_request_code: 11e72229359a4fdeb038dd6713dc9330

src/main/resources/pdm.properties

@@ -1,2 +0,0 @@
-user_name=STWPDM
-password=STWSTOCKAPI