添加事项接口

common-lib/src/main/java/com/mortals/xhx/common/pdu/skin/SkinBasePdu.java

 package com.mortals.xhx.common.pdu.skin;
+
 import com.mortals.framework.model.BaseEntityLong;
 import lombok.Data;
 
 /**
-* 系统基础皮肤Pdu对象
-*
-* @author zxfei
-* @date 2023-04-03
-*/
+ * 系统基础皮肤Pdu对象
+ *
+ * @author zxfei
+ * @date 2024-09-23
+ */
 @Data
 public class SkinBasePdu extends BaseEntityLong {
     private static final long serialVersionUID = 1L;
 
     /**
-    * 所属种类,来源种类
-    */
+     * 所属种类,来源种类
+     */
     private Long categoryId;
     /**
-    * 产品id
-    */
+     * 产品id
+     */
     private Long productId;
     /**
-    * 产品名称
-    */
+     * 产品名称
+     */
     private String productName;
     /**
-    * css模板合成后文件地址
-    */
+     * css模板合成后文件地址
+     */
     private String cssFilePath;
     /**
-    * 排序编号
-    */
+     * 排序编号
+     */
     private Integer sortNum;
     /**
-    * 产品皮肤名称，唯一且不为空
-    */
+     * 产品皮肤名称，唯一且不为空
+     */
     private String name;
     /**
-    * 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
-    */
+     * 分辨率 (1.1920*1080，2.1080*1920，3.1280*1280)
+     */
     private String imageResolution;
     /**
-    * 预览图片
-    */
+     * 预览图片
+     */
     private String previewImagePath;
+    /**
+     * 产品编码
+     */
+    private String productCode;
 
-public void initAttrValue(){
-
-            this.categoryId = null;
-
-            this.productId = null;
-
-            this.productName = "";
-
-            this.cssFilePath = "";
-
-            this.sortNum = null;
+    private String imageResolutionValue;
+    private String serverName;
 
-            this.name = "";
+    private Integer serverPort;
 
-            this.imageResolution = "1";
+    private String localZipPath;
 
-            this.previewImagePath = "";
-    }
+    private String prependPath;
 }
\ No newline at end of file

common-lib/src/main/java/com/mortals/xhx/common/pdu/user/LoginPdu.java

+package com.mortals.xhx.common.pdu.user;
+
+import com.mortals.framework.exception.AppException;
+import lombok.Data;
+
+
+@Data
+public class LoginPdu {
+    private String loginName;
+
+    private String password;
+
+    private String securityCode;
+
+    private String mark;
+    /** 加密方式 1不加密，2加密*/
+    private Integer type;
+
+
+    @Override
+    public String toString() {
+        return "loginName:" + this.loginName + "  password:" + this.password;
+    }
+
+    public boolean validate() throws AppException {
+        if (loginName == null || loginName.trim().length() == 0) {
+            throw new AppException("帐号不能为空！");
+        }
+        if (password == null || password.trim().length() == 0) {
+            throw new AppException("密码不能为空！");
+        }
+        return true;
+    }
+}

common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java

 package com.mortals.xhx.feign.user;
 
-import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.Rest;
 import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.IFeign;
 import feign.hystrix.FallbackFactory;
@@ -38,7 +38,7 @@ public interface IUserFeign extends IFeign {
      * @param id
      * @return
      */
-    @GetMapping(value = "/user/info")
+    @GetMapping(value = "/user/interinfo")
     Rest<UserPdu> info(@RequestParam(value = "id") Long id);
 
     /**
@@ -62,7 +62,7 @@ public interface IUserFeign extends IFeign {
 
 
     @PostMapping(value = "/login/login")
-    String portalLogin(@RequestBody UserPdu userPdu);
+    String portalLogin(@RequestBody LoginPdu loginPdu);
 
     /**
      * 查询用户列表
@@ -114,8 +114,8 @@ class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
             }
 
             @Override
-            public String portalLogin(UserPdu userPdu) {
-                return JSON.toJSONString(Rest.fail("登录失败!"));
+            public String portalLogin(LoginPdu loginPdu) {
+                return null;
             }
 
             @Override

fill-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java

@@ -19,6 +19,7 @@ import com.mortals.xhx.base.system.user.model.UserEntity;
 import com.mortals.xhx.base.system.user.service.UserService;
 import com.mortals.xhx.base.system.valid.service.ValidCodeService;
 import com.mortals.xhx.common.key.RedisKey;
+import com.mortals.xhx.common.pdu.user.LoginPdu;
 import com.mortals.xhx.common.pdu.user.UserPdu;
 import com.mortals.xhx.feign.user.IUserFeign;
 import org.apache.commons.logging.Log;
@@ -62,10 +63,11 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
         String loginName = loginForm.getLoginName();
         String password = loginForm.getPassword();
 
-        UserPdu userPdu = new UserPdu();
-        userPdu.setLoginName(loginName);
-        userPdu.setPassword(password);
-        String resp = userFeign.portalLogin(userPdu);
+        LoginPdu loginPdu = new LoginPdu();
+        loginPdu.setLoginName(loginName);
+        loginPdu.setPassword(password);
+        loginPdu.setSecurityCode("admin");
+        String resp = userFeign.portalLogin(loginPdu);
 
         return resp;
 

fill-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -23,5 +23,10 @@
 
   "base-reg": {
     "baseUrl": "http://10.207.153.66:11078/fm"
+  },
+
+  "base-qiling": {
+    "baseUrl": "http://192.168.0.239:17217/fm"
   }
+
 }
\ No newline at end of file

fill-manager/src/test/java/com/mortals/httpclient/matter/MatterController.http

@@ -14,7 +14,7 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
 ###事项申请材料业务列表
-POST {{baseUrl}}/matter/list
+POST {{baseUrl}}/matter/interlist
 Content-Type: application/json
 
 {