fix: 修复Getter/Setter转换器 - 支持链式调用

🐛 Bug: getter/setter转换器不支持链式调用
- item.key.getName() ❌ 未转换
- delParam.ids.getClass().getName() ❌ 未转换

✅ 修复:
- 正则从 /(\w+)\.get/ 改为 /([\w.()]+)\.get/
- 支持 obj.method().getXxx() 链式调用
- 支持 obj.method().setXxx(value) 链式调用

📊 预期效果: 彻底转换所有getter/setter调用

wwjcloud-nest-v1/tools/java-to-nestjs-migration/converters/method/getter-setter.converter.js

@@ -23,8 +23,9 @@ class GetterSetterConverter {
     // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
     // 通用模式：obj.getXxx() → obj.xxx
-    // 匹配: (对象).get(首字母大写的属性名)()
-    tsCode = tsCode.replace(/(\w+)\.get([A-Z]\w*)\(\)/g, (match, obj, property) => {
+    // 支持链式调用：obj.method().getXxx() 或 obj.getXxx()
+    // 匹配: (对象或表达式).get(首字母大写的属性名)()
+    tsCode = tsCode.replace(/([\w.()]+)\.get([A-Z]\w*)\(\)/g, (match, obj, property) => {
       // 将首字母转换为小写
       const propertyName = property.charAt(0).toLowerCase() + property.slice(1);
       return `${obj}.${propertyName}`;
@@ -35,8 +36,9 @@ class GetterSetterConverter {
     // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
     // 通用模式：obj.setXxx(value) → obj.xxx = value
-    // 匹配: (对象).set(首字母大写的属性名)((参数))
-    tsCode = tsCode.replace(/(\w+)\.set([A-Z]\w*)\(([^)]+)\)/g, (match, obj, property, value) => {
+    // 支持链式调用：obj.method().setXxx(value) 或 obj.setXxx(value)
+    // 匹配: (对象或表达式).set(首字母大写的属性名)((参数))
+    tsCode = tsCode.replace(/([\w.()]+)\.set([A-Z]\w*)\(([^)]+)\)/g, (match, obj, property, value) => {
       // 将首字母转换为小写
       const propertyName = property.charAt(0).toLowerCase() + property.slice(1);
       return `${obj}.${propertyName} = ${value}`;

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-develop-service-impl.service.ts

@@ -23,7 +23,7 @@ export class AddonDevelopServiceImplService {
     
             try {
                 // 获取已安装的插件
-                const installAddonList: Record<String, InstallAddonListVo> = this.coreAddonService.getInstallAddonList();
+                const installAddonList: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList;
     
                 // 获取本地所有的插件
                 const localAddons: string[] = fs.readdirSync(this.appConfig.webRootDownAddon)
@@ -36,7 +36,7 @@ export class AddonDevelopServiceImplService {
                         const info: Record<string, any> = JsonUtils.parseObject<any>(JsonUtils.parseObject<any>(fs.readFileSync(path.join(file, "info.json"), 'utf-8')));
                         const addon: string = info.getStr("key");
                         const addonDevelopListVo: AddonDevelopListVo = Object.assign(new AddonDevelopListVo(), info) /* TODO: 检查AddonDevelopListVo构造函数 */;
-                        if (installAddonList.get(addon) != null) addonDevelopListVo.setInstallInfo(installAddonList.get(addon));
+                        if (installAddonList.get(addon) != null) addonDevelopListVo.installInfo = installAddonList.get(addon);
                         addonDevelopListVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64');
                         addonDevelopListVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64');
                         list.push(addonDevelopListVo);
@@ -94,7 +94,7 @@ export class AddonDevelopServiceImplService {
                 model.icon = param.icon;
                 model.key = param.key;
                 model.type = param.type;
-                model.supportApp = param.getSupportApp();
+                model.supportApp = param.supportApp;
                 this.coreAddonService.set(model);
             }
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/addon/impl/addon-service-impl.service.ts

@@ -26,21 +26,21 @@ export class AddonServiceImplService {
             const list: Record<String, LocalAddonInfoVo> = new const installAddonList: Record<>();
     
             // 获取已安装的插件
-            Record<String, InstallAddonListVo> = this.this.CoreAddonService.getInstallAddonList();
+            Record<String, InstallAddonListVo> = this.this.CoreAddonService.installAddonList;
     
             try {
-                const moduleList: ModuleListVo[] = this.niucloudService.getModuleList();
+                const moduleList: ModuleListVo[] = this.niucloudService.moduleList;
     
                 for (const item of moduleList) {
-                    ModuleListVo.const app: App = item.getApp();
+                    ModuleListVo.const app: App = item.app;
                     const addonInfoVo: LocalAddonInfoVo = new LocalAddonInfoVo();
                     addonInfoVo.title = app.appName;
                     addonInfoVo.desc = app.appDesc;
                     addonInfoVo.key = app.appKey;
-                    addonInfoVo.setAuthor(item.getSiteName());
+                    addonInfoVo.author = item.siteName;
                     addonInfoVo.version = item.version;
-                    addonInfoVo.setIsLocal(false);
-                    addonInfoVo.setIsDownload(false);
+                    addonInfoVo.isLocal = false;
+                    addonInfoVo.isDownload = false;
                     addonInfoVo.type = app.appType;
                     addonInfoVo.icon = app.appLogo;
                     addonInfoVo.cover = app.windowLogo[0];
@@ -59,18 +59,18 @@ export class AddonServiceImplService {
                         const addon: string = info.getStr("key");
                         if (list.get(addon) != null) {
                             const addonInfoVo: LocalAddonInfoVo = list.get(addon);
-                            addonInfoVo.setIsDownload(true);
-                            addonInfoVo.setIsLocal(false);
+                            addonInfoVo.isDownload = true;
+                            addonInfoVo.isLocal = false;
                             if (installAddonList.get(addon) != null) {
-                                addonInfoVo.setInstallInfo(installAddonList.get(addon));
+                                addonInfoVo.installInfo = installAddonList.get(addon);
                             }
                             list.put(addon, addonInfoVo);
                         } else {
                             const localAddonInfoVo: LocalAddonInfoVo = Object.assign(new LocalAddonInfoVo(), info) /* TODO: 检查LocalAddonInfoVo构造函数 */;
-                            localAddonInfoVo.setIsLocal(true);
-                            localAddonInfoVo.setIsDownload(true);
+                            localAddonInfoVo.isLocal = true;
+                            localAddonInfoVo.isDownload = true;
                             if (installAddonList.get(addon) != null)
-                                localAddonInfoVo.setInstallInfo(installAddonList.get(addon));
+                                localAddonInfoVo.installInfo = installAddonList.get(addon);
                             localAddonInfoVo.icon = fs.readFileSync(file + "/resource/icon.png", 'base64');
                             localAddonInfoVo.cover = fs.readFileSync(file + "/resource/cover.png", 'base64');
                             list.put(addon, localAddonInfoVo);
@@ -82,7 +82,7 @@ export class AddonServiceImplService {
                 vo.error = e.message;
             }
     
-            vo.setList(list);
+            vo.list = list;
             return vo;
   }
 
@@ -126,13 +126,13 @@ export class AddonServiceImplService {
     const model: Addon = new Addon();
     
             model.createTime = Date.now( / 1000);
-            model.setInstallTime(addonParam.getInstallTime());
+            model.installTime = addonParam.installTime;
             model.updateTime = Date.now( / 1000);
             model.cover = addonParam.cover;
             model.type = addonParam.type;
-            model.supportApp = addonParam.getSupportApp();
-            model.setIsStar(addonParam.getIsStar());
-            model.setCompile(String.join(",", addonParam.getCompile()));
+            model.supportApp = addonParam.supportApp;
+            model.isStar = addonParam.isStar;
+            model.compile = String.join(",", addonParam.compile);
             // BeanUtil.copyProperties(sysPositionEditParam, sysPosition);
             this.addonRepository.save(model);
   }
@@ -155,7 +155,7 @@ export class AddonServiceImplService {
    * getInstallTask
    */
   async getInstallTask(): Promise<any> {
-    return this.this.CoreAddonInstallService.getInstallTask();
+    return this.this.CoreAddonInstallService.installTask;
   }
 
   /**
@@ -223,16 +223,16 @@ export class AddonServiceImplService {
    * download
    */
   async download(addon: string, version: string): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const actionQuery: Record<String, Object> = new const query: Record<>();
             actionQuery.put("data[app_key]", addon);
             actionQuery.put("data[version]", version);
-            actionQuery.put("data[product_key]", instance.getProductKey());
+            actionQuery.put("data[product_key]", instance.productKey);
             const actionToken: Record<string, any> = this.niucloudService.getActionToken("download", actionQuery);
     
             Record<String, Object> = {};
-            query.put("authorize_code", instance.getCode());
+            query.put("authorize_code", instance.code);
             query.put("addon_name", addon);
             query.put("version", version);
             query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
@@ -263,10 +263,10 @@ export class AddonServiceImplService {
    */
   async getIndexAddonList(param: IndexAddonListParam): Promise<any> {
     const params: Record<String, Object> = {};
-            const config: NiucloudConfigVo = this.coreNiucloudConfigService.getNiucloudConfig();
-            params.put("code", config.getAuthCode());
-            params.put("secret", config.getAuthSecret());
-            params.put("labels", param.getLabelId());
+            const config: NiucloudConfigVo = this.coreNiucloudConfigService.niucloudConfig;
+            params.put("code", config.authCode);
+            params.put("secret", config.authSecret);
+            params.put("labels", param.labelId);
             params.put("product_key", "sass");
             params.put("is_recommend", 1);
             params.put("order_field", "sale_num desc, visit_num desc");

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/aliapp/impl/aliapp-config-service-impl.service.ts

@@ -22,6 +22,6 @@ export class AliappConfigServiceImplService {
    * setAliappConfig
    */
   async setAliappConfig(aliappConfigParam: AliappConfigParam): Promise<any> {
-    this.coreAliappConfigService.setAliappConfig(this.requestContext.siteId, aliappConfigParam);
+    this.coreAliappConfigService.aliappConfig = this.requestContext.siteId, aliappConfigParam;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/auth-service-impl.service.ts

@@ -38,7 +38,7 @@ export class AuthServiceImplService {
                     throw new UnauthorizedException("NO_SITE_PERMISSION", 400);
                 }
             }
-            RequestUtils.setAppType(siteinfo.appType);
+            RequestUtils.appType = siteinfo.appType;
   }
 
   /**
@@ -52,8 +52,8 @@ export class AuthServiceImplService {
                 return superAdminUid === uid;
             } else {
                 const sysUserRole: SysUserRole = this.sysUserRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_admin", 1).last(" limit 1"));
-                cached.tag("adminAuth").put("superAdminUid", sysUserRole.getUid());
-                return sysUserRole.getUid() === uid;
+                cached.tag("adminAuth").put("superAdminUid", sysUserRole.uid);
+                return sysUserRole.uid === uid;
             }
   }
 
@@ -62,16 +62,16 @@ export class AuthServiceImplService {
    */
   async checkRole(request: HttpServletRequest): Promise<any> {
     //当前访问的路由地址
-            const rule: string = RequestUtils.getReqeustURI();
-            const method: string = RequestUtils.getRequestMethod();
+            const rule: string = RequestUtils.reqeustURI;
+            const method: string = RequestUtils.requestMethod;
     
             //缓存站点信息数据
             const siteinfo: SiteInfoVo = this.siteService.info(this.requestContext.siteId);
             if (method !== "get") {
-                if (siteinfo.status === SiteStatusEnum.EXPIRE.getCode()) {
+                if (siteinfo.status === SiteStatusEnum.EXPIRE.code) {
                     throw new UnauthorizedException("站点已打烊，续费后可继续使用此项功能", 400);
                 }
-                if (siteinfo.status === SiteStatusEnum.CLOSE.getCode()) {
+                if (siteinfo.status === SiteStatusEnum.CLOSE.code) {
                     throw new UnauthorizedException("站点已停止", 400);
                 }
             }
@@ -89,7 +89,7 @@ export class AuthServiceImplService {
                     throw new UnauthorizedException("NO_PERMISSION", 400);
                 }
             }
-            Map<String, String[]> roleMenuList = this.getAuthApiList();
+            Map<String, String[]> roleMenuList = this.authApiList;
             /*if(roleMenuList.get(method).size()<=0 || roleMenuList.get(method).indexOf(rule)<=0){
                 throw new UnauthorizedException("NO_PERMISSION");
             }*/
@@ -99,7 +99,7 @@ export class AuthServiceImplService {
    * checkIsDemo
    */
   async checkIsDemo(request: HttpServletRequest): Promise<any> {
-    const method: string = RequestUtils.getRequestMethod();
+    const method: string = RequestUtils.requestMethod;
     
             if (method !== "get" && this.appConfig.isDemo) {
                 throw new BadRequestException("演示环境不允许操作");
@@ -124,12 +124,12 @@ export class AuthServiceImplService {
                 if (ObjectUtil.isNull(sysUserRoleInfoVo)) {
                     return new JSONArray();
                 }
-                isAdmin = sysUserRoleInfoVo.getIsAdmin();//是否是超级管理员
+                isAdmin = sysUserRoleInfoVo.isAdmin;//是否是超级管理员
             }
             if (isAdmin > 0) {
                 menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 1, 0, [], addon);
             } else {
-                const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.getRoleIds()), String.class);
+                const roleIdList: string[] = JSONUtil.toList(JSONUtil.parseArray(sysUserRoleInfoVo.roleIds), String.class);
                 const menuKeyList: string[] = this.sysRoleService.getMenuIdsByRoleIds(siteId, roleIdList);
                 menuList = this.sysMenuService.getMenuListByCondition(appType, siteId, 100, 0, menuKeyList, addon);
             }
@@ -158,7 +158,7 @@ export class AuthServiceImplService {
     //        const authUserInfoVo: AuthUserInfoVo = sysUserRoleMapper.selectJoinOne(AuthUserInfoVo.class, userRoleMPJQueryWrapper);
     //        if(ObjectUtil.isNotNull(authUserInfoVo))
     //        {
-    //            authUserInfoVo.setStatusName("");
+    //            authUserInfoVo.statusName = "";
     //        }
     //
     //        return authUserInfoVo;
@@ -168,16 +168,16 @@ export class AuthServiceImplService {
    * editAuth
    */
   async editAuth(editAuthUserParam: EditAuthUserParam): Promise<any> {
-    if (ObjectUtil.isNotNull(editAuthUserParam.getPassword()) && CommonUtils.isNotEmpty(editAuthUserParam.getPassword())) {
+    if (ObjectUtil.isNotNull(editAuthUserParam.password) && CommonUtils.isNotEmpty(editAuthUserParam.password)) {
                 const sysUser: SysUser = this.sysUserService.find(RequestUtils.uid());
-                if (!PasswordEncipher.matche(editAuthUserParam.getOriginalPassword(), sysUser.getPassword())) {
+                if (!PasswordEncipher.matche(editAuthUserParam.originalPassword, sysUser.password)) {
                     throw new UnauthorizedException("OLD_PASSWORD_ERROR");
                 }
             }
             const sysUserParam: SysUserParam = new SysUserParam();
-            sysUserParam.setHeadImg(editAuthUserParam.getHeadImg());
-            sysUserParam.setRealName(editAuthUserParam.getRealName());
-            sysUserParam.setPassword(editAuthUserParam.getPassword());
+            sysUserParam.headImg = editAuthUserParam.headImg;
+            sysUserParam.realName = editAuthUserParam.realName;
+            sysUserParam.password = editAuthUserParam.password;
             this.sysUserService.edit(RequestUtils.uid(), sysUserParam);
   }
 
@@ -185,19 +185,19 @@ export class AuthServiceImplService {
    * addUserLog
    */
   async addUserLog(request: HttpServletRequest): Promise<any> {
-    if (RequestUtils.getRequestMethod() === "get") return;
+    if (RequestUtils.requestMethod === "get") return;
     
             try {
                 const model: SysUserLog = new SysUserLog();
                 model.siteId = this.requestContext.siteId;
-                model.setUid(RequestUtils.uid());
-                model.setIp(RequestUtils.ip());
-                model.setUsername(StpUtil.getExtra("userName").toString());
-                model.url = RequestUtils.getReqeustURI();
-                model.setParams("{}");
-                model.type = RequestUtils.getRequestMethod();
+                model.uid = RequestUtils.uid();
+                model.ip = RequestUtils.ip();
+                model.username = StpUtil.getExtra("userName".toString());
+                model.url = RequestUtils.reqeustURI;
+                model.params = "{}";
+                model.type = RequestUtils.requestMethod;
                 model.createTime = Date.now( / 1000);
-                model.setOperation(getDescription(request));
+                model.operation = getDescription(request);
                 this.sysUserLogRepository.save(model);
             } catch (e) {
             }
@@ -207,6 +207,6 @@ export class AuthServiceImplService {
    * setIsAllowChangeSite
    */
   async setIsAllowChangeSite(param: Map<String, param: Integer>): Promise<any> {
-    this.coreConfigService.setConfig(0,"IS_ALLOW_CHANGE_SITE", JsonUtils.parseObject<any>(param));
+    this.coreConfigService.config = 0,"IS_ALLOW_CHANGE_SITE", JsonUtils.parseObject<any>(param);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/config-service-impl.service.ts

@@ -26,10 +26,10 @@ export class ConfigServiceImplService {
    */
   async setLoginConfig(loginConfigParam: LoginConfigParam): Promise<any> {
     const jsonObject: Record<string, any> = new Record<string, any>();
-            jsonObject.set("is_captcha", loginConfigParam.getIsCaptcha());
-            jsonObject.set("is_site_captcha", loginConfigParam.getIsSiteCaptcha());
-            jsonObject.set("bg", loginConfigParam.getBg());
-            jsonObject.set("site_bg", loginConfigParam.getSiteBg());
-            this.coreConfigService.setConfig(this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN), jsonObject);
+            jsonObject.set("is_captcha", loginConfigParam.isCaptcha);
+            jsonObject.set("is_site_captcha", loginConfigParam.isSiteCaptcha);
+            jsonObject.set("bg", loginConfigParam.bg);
+            jsonObject.set("site_bg", loginConfigParam.siteBg);
+            this.coreConfigService.config = this.requestContext.siteId, ConfigKeyEnum.path.basename(ADMIN_LOGIN, jsonObject);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/auth/impl/login-service-impl.service.ts

@@ -17,26 +17,26 @@ export class LoginServiceImplService {
    */
   async login(userLoginParam: UserLoginParam): Promise<any> {
     const appType: string = userLoginParam.appType;
-            const userName: string = userLoginParam.getUsername();
-            const passWord: string = userLoginParam.getPassword();
+            const userName: string = userLoginParam.username;
+            const passWord: string = userLoginParam.password;
     
             if(!EnumUtils.isInclude(appType, AppTypeEnum.class, "getName")){
                 throw new UnauthorizedException("APP_TYPE_NOT_EXIST");
             }
             const siteId: number = this.requestContext.siteId;
     
-            const loginConfigVo: LoginConfigVo = this.configService.getLoginConfig();
+            const loginConfigVo: LoginConfigVo = this.configService.loginConfig;
             const isCaptcha: number = 0;
             if(appType === AppTypeEnum.path.basename(ADMIN)){
-                isCaptcha=loginConfigVo.getIsCaptcha();
+                isCaptcha=loginConfigVo.isCaptcha;
             }else if(appType === AppTypeEnum.path.basename(SITE)){
-                isCaptcha=loginConfigVo.getIsSiteCaptcha();
+                isCaptcha=loginConfigVo.isSiteCaptcha;
             }
     
             if(isCaptcha==1){
                 //验证验证码
                 const captchaVO: CaptchaVO = new CaptchaVO();
-                captchaVO.setCaptchaVerification(userLoginParam.getCaptchaCode());
+                captchaVO.captchaVerification = userLoginParam.captchaCode;
                 this.coreCaptchaImgService.verification(captchaVO);
             }
             const userInfo: SysUserInfoVo = this.sysUserService.getUserInfoByUserName(userName);
@@ -45,18 +45,18 @@ export class LoginServiceImplService {
             }
     
             //检测密码加密是否正确
-            if(!PasswordEncipher.matche(passWord, userInfo.getPassword())){
+            if(!PasswordEncipher.matche(passWord, userInfo.password)){
                 throw new UnauthorizedException("账号密码错误");
             }
             //设置当前登录用户id
-            RequestUtils.setUid(userInfo.getUid());
+            RequestUtils.uid = userInfo.uid;
     
             const defaultSiteId: number = 0;
             const roleInfoVo: SysUserRoleInfoVo = new SysUserRoleInfoVo();
             const siteIds: number[] = [];
             if(appType === AppTypeEnum.path.basename(ADMIN)){
                 defaultSiteId=RequestUtils.defaultSiteId();
-                roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.getUid());
+                roleInfoVo=this.sysUserRoleService.getUserRole(defaultSiteId, userInfo.uid);
                 if(ObjectUtil.isNotNull(roleInfoVo)){
                     if(userInfo.status<=0){
                         throw new UnauthorizedException("账号被锁定");
@@ -65,7 +65,7 @@ export class LoginServiceImplService {
                     appType=AppTypeEnum.path.basename(SITE);
                 }
             }else if(appType === AppTypeEnum.path.basename(SITE)){
-                siteIds=this.authSiteService.getSiteIds();
+                siteIds=this.authSiteService.siteIds;
                 if(ObjectUtil.isNotNull(siteIds) && siteIds.length>0){
                     defaultSiteId=siteIds.indexOf(this.requestContext.siteId)>0 || this.authService.isSuperAdmin()?this.requestContext.siteId:siteIds.get(0);
                 }
@@ -74,41 +74,41 @@ export class LoginServiceImplService {
             }
     
             //修改用户登录信息
-            this.sysUserService.editUserLoginInfo(userInfo.getUid());
+            this.sysUserService.editUserLoginInfo(userInfo.uid);
     
             const loginModel: SaLoginModel = SaLoginModel.create();
-            loginModel.setDevice(RequestUtils.handler().getHeader("User-Agent"));
-            loginModel.setExtra("userName", userInfo.getUsername());
-            loginModel.setExtra("headImg", userInfo.getHeadImg());
-            loginModel.setExtra("realName", userInfo.getRealName());
+            loginModel.device = RequestUtils.handler(.getHeader("User-Agent"));
+            loginModel.extra = "userName", userInfo.username;
+            loginModel.extra = "headImg", userInfo.headImg;
+            loginModel.extra = "realName", userInfo.realName;
             // 执行登录
-            StpUtil.login("user-" + userInfo.getUid(), loginModel);
+            StpUtil.login("user-" + userInfo.uid, loginModel);
             // 获取返回内容
-            const saTokenInfo: SaTokenInfo = StpUtil.getTokenInfo();
+            const saTokenInfo: SaTokenInfo = StpUtil.tokenInfo;
             const resultVo: LoginResultVo = new LoginResultVo();
     
             const userInfoVo: LoginUserInfoVo = new LoginUserInfoVo();
-            userInfoVo.setUid(userInfo.getUid());
-            userInfoVo.setUsername(userInfo.getUsername());
-            userInfoVo.setHeadImg(userInfo.getHeadImg());
-            userInfoVo.setIsSuperAdmin(this.authService.isSuperAdmin());
+            userInfoVo.uid = userInfo.uid;
+            userInfoVo.username = userInfo.username;
+            userInfoVo.headImg = userInfo.headImg;
+            userInfoVo.isSuperAdmin = this.authService.isSuperAdmin();
     
     
             if(appType === AppTypeEnum.path.basename(ADMIN) || (appType === AppTypeEnum.path.basename(SITE) && defaultSiteId>0)){
                 RequestUtils.siteId = defaultSiteId;
                 const siteInfoVo: SiteInfoVo = this.siteService.info(this.requestContext.siteId);
-                resultVo.setSiteInfo(siteInfoVo);
+                resultVo.siteInfo = siteInfoVo;
             }
-            if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.getIsSuperAdmin()){
-                siteIds=this.authSiteService.getSiteIds();
+            if(appType === AppTypeEnum.path.basename(ADMIN) && !userInfoVo.isSuperAdmin){
+                siteIds=this.authSiteService.siteIds;
             }
     
-            resultVo.setToken(saTokenInfo.getTokenValue());
-            resultVo.setExpiresTime(DateUtils.currTime()+saTokenInfo.getTokenTimeout());
-            resultVo.setUserinfo(userInfoVo);
+            resultVo.token = saTokenInfo.tokenValue;
+            resultVo.expiresTime = DateUtils.currTime(+saTokenInfo.tokenTimeout);
+            resultVo.userinfo = userInfoVo;
             resultVo.siteId = defaultSiteId;
-            resultVo.setUserrole(roleInfoVo);
-            userInfoVo.setSiteIds(siteIds);
+            resultVo.userrole = roleInfoVo;
+            userInfoVo.siteIds = siteIds;
     
             return resultVo;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/channel/impl/admin-app-service-impl.service.ts

@@ -27,7 +27,7 @@ export class AdminAppServiceImplService {
    * setAppConfig
    */
   async setAppConfig(param: SetAppParam): Promise<any> {
-    this.coreAppService.setConfig(this.requestContext.siteId, param);
+    this.coreAppService.config = this.requestContext.siteId, param;
   }
 
   /**
@@ -39,8 +39,8 @@ export class AdminAppServiceImplService {
             any /* TODO: QueryWrapper<AppVersion> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
             
-            if (param.getPlatform() != null) {
-                queryWrapper.eq("platform", param.getPlatform());
+            if (param.platform != null) {
+                queryWrapper.eq("platform", param.platform);
             }
             queryWrapper.orderByDesc("create_time");
             
@@ -87,7 +87,7 @@ export class AdminAppServiceImplService {
                     .orderByDesc("id")
                     .last("limit 1")
             );
-            if (lastVersion != null && number.valueOf(param.getVersionCode()) <= number.valueOf(lastVersion.getVersionCode())) {
+            if (lastVersion != null && number.valueOf(param.versionCode) <= number.valueOf(lastVersion.versionCode)) {
                 throw new BadRequestException("版本号必须高于上一版本设置的值");
             }
     
@@ -96,8 +96,8 @@ export class AdminAppServiceImplService {
             BeanUtil.copyProperties(param, appVersion);
             appVersion.createTime = DateUtils.currTime();
     
-            if (param.getPackageType() === "cloud") {
-                appVersion.setTaskKey(this.coreAppCloudService.appCloudBuid(param));
+            if (param.packageType === "cloud") {
+                appVersion.taskKey = this.coreAppCloudService.appCloudBuid(param);
                 appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value;
             } else {
                 appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value;
@@ -120,16 +120,16 @@ export class AdminAppServiceImplService {
                     .orderByDesc("id")
                     .last("limit 1")
             );
-            if (lastVersion != null && number.valueOf(param.getVersionCode()) <= number.valueOf(lastVersion.getVersionCode())) {
+            if (lastVersion != null && number.valueOf(param.versionCode) <= number.valueOf(lastVersion.versionCode)) {
                 throw new BadRequestException("版本号必须高于上一版本设置的值");
             }
     
             BeanUtil.copyProperties(param, appVersion);
             appVersion.updateTime = DateUtils.currTime();
     
-            if (param.getPackageType() === "cloud") {
+            if (param.packageType === "cloud") {
                 param.siteId = this.requestContext.siteId;
-                appVersion.setTaskKey(this.coreAppCloudService.appCloudBuid(param));
+                appVersion.taskKey = this.coreAppCloudService.appCloudBuid(param);
                 appVersion.status = AppDict.StatusEnum.STATUS_CREATING.value;
             } else {
                 appVersion.status = AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value;
@@ -157,7 +157,7 @@ export class AdminAppServiceImplService {
                     .eq("site_id", this.requestContext.siteId)
                     .set("status", AppDict.StatusEnum.STATUS_CREATE_FAIL.value)
                     .set("update_time", DateUtils.currTime())
-                    .set("fail_reason", ObjectUtil.defaultIfNull(vo.getFailReason(), "") ));
+                    .set("fail_reason", ObjectUtil.defaultIfNull(vo.failReason, "") ));
             }
             if (vo.status === "success") {
                 this.appVersionRepository.save(null, new UpdateWrapper<AppVersion>()
@@ -165,7 +165,7 @@ export class AdminAppServiceImplService {
                     .eq("site_id", this.requestContext.siteId)
                     .set("status", AppDict.StatusEnum.STATUS_UPLOAD_SUCCESS.value)
                     .set("update_time", DateUtils.currTime())
-                    .set("package_path", vo.getFilePath() ));
+                    .set("package_path", vo.filePath ));
             }
             return vo;
   }
@@ -185,7 +185,7 @@ export class AdminAppServiceImplService {
             const model: AppVersion = new AppVersion();
             model.id = appVersion.id;
             appVersion.status = AppDict.StatusEnum.STATUS_PUBLISHED.value;
-            appVersion.setReleaseTime(DateUtils.currTime());
+            appVersion.releaseTime = DateUtils.currTime();
     
             return appVersionMapper.updateById(appVersion) > 0;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/dict/impl/dict-service-impl.service.ts

@@ -63,8 +63,8 @@ export class DictServiceImplService {
     const model: SysDict = new SysDict();
             model.name = path.basename(addParam);
             model.key = addParam.key;
-            model.setMemo(addParam.getMemo());
-            model.setDictionary("[]");
+            model.memo = addParam.memo;
+            model.dictionary = "[]";
             model.createTime = Date.now( / 1000);
             model.updateTime = Date.now( / 1000);
             this.dictRepository.save(model);
@@ -82,7 +82,7 @@ export class DictServiceImplService {
             model.id = id;
             model.name = path.basename(editParam);
             model.key = editParam.key;
-            model.setMemo(editParam.getMemo());
+            model.memo = editParam.memo;
             model.updateTime = Date.now( / 1000);
             dictMapper.updateById(model);
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-config-service-impl.service.ts

@@ -15,7 +15,7 @@ export class DiyConfigServiceImplService {
    * getBottomList
    */
   async getBottomList(): Promise<any> {
-    return this.coreDiyConfigService.getBottomList();
+    return this.coreDiyConfigService.bottomList;
   }
 
   /**
@@ -29,6 +29,6 @@ export class DiyConfigServiceImplService {
    * setBottomConfig
    */
   async setBottomConfig(param: SetBottomConfigParam): Promise<any> {
-    this.coreDiyConfigService.setBottomConfig(this.requestContext.siteId, param.value, param.key);
+    this.coreDiyConfigService.bottomConfig = this.requestContext.siteId, param.value, param.key;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-route-service-impl.service.ts

@@ -18,7 +18,7 @@ export class DiyRouteServiceImplService {
    * list
    */
   async list(searchParam: DiyRouteSearchParam): Promise<any[]> {
-    const linkEnum: Record<string, any> = LinkEnum.getLink();
+    const linkEnum: Record<string, any> = LinkEnum.link;
             const routerList: DiyRouteListVo[] = [];
             const sort: number = 0;
     

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-service-impl.service.ts

@@ -33,24 +33,24 @@ export class DiyServiceImplService {
             queryWrapper.orderByDesc("id");
     
             if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title);
-            if (CommonUtils.isNotEmpty(searchParam.getMode())) queryWrapper.eq("mode", searchParam.getMode());
+            if (CommonUtils.isNotEmpty(searchParam.mode)) queryWrapper.eq("mode", searchParam.mode);
             if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type);
     
-            const template: Record<string, any> = TemplateEnum.getTemplate();
+            const template: Record<string, any> = TemplateEnum.template;
             List<Record<String, Object>> templateAddon = TemplateEnum.getTemplateAddons((this.requestContext.siteId));
             [DiyPage[], number] iPage = this.diyPageRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: DiyPageListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: DiyPageListVo = new DiyPageListVo();
                 Object.assign(vo, item);
-                vo.setTypeName(ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".title", String.class), ""));
-                vo.setTypePage(ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".page", String.class), ""));
+                vo.typeName = ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".title", String.class, ""));
+                vo.typePage = ObjectUtil.defaultIfNull(template.getByPath(vo.type + ".page", String.class, ""));
                 const addonName: string = templateAddon
                         .filter(temp => vo.type != null && vo.type === temp.get("type"))
                         .findFirst()
                         .map(addon => ObjectUtil.defaultIfNull(addon.get("title"), "").toString())
                         .orElse("");
-                    vo.setAddonName(addonName);
+                    vo.addonName = addonName;
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -65,7 +65,7 @@ export class DiyServiceImplService {
             queryWrapper.orderByDesc("id");
     
             if (CommonUtils.isNotEmpty(searchParam.title)) queryWrapper.like("title", searchParam.title);
-            if (CommonUtils.isNotEmpty(searchParam.getMode())) queryWrapper.eq("mode", searchParam.getMode());
+            if (CommonUtils.isNotEmpty(searchParam.mode)) queryWrapper.eq("mode", searchParam.mode);
             if (CommonUtils.isNotEmpty(searchParam.type)) {
                 const type: string[] = Arrays.stream(searchParam.type);
                 queryWrapper.in("type", type);
@@ -153,11 +153,11 @@ export class DiyServiceImplService {
             if (!model) throw new BadRequestException("页面不存在!");
     
             const update: DiyPage = new DiyPage();
-            update.setIsDefault(0);
+            update.isDefault = 0;
             this.diyPageRepository.save(update, /* TODO: any /* TODO: QueryWrapper<DiyPage> */需改写为TypeORM的where条件对象 */.eq("name", path.basename(model)).eq("site_id", this.requestContext.siteId));
     
             update.id = id;
-            update.setIsDefault(1);
+            update.isDefault = 1;
             update.updateTime = Date.now( / 1000);
             diyPageMapper.updateById(update);
   }
@@ -166,7 +166,7 @@ export class DiyServiceImplService {
    * getLink
    */
   async getLink(): Promise<any> {
-    const linkEnum: Record<string, any> = LinkEnum.getLink();
+    const linkEnum: Record<string, any> = LinkEnum.link;
             for (const key of linkEnum.keySet()) {
                 const item: Record<string, any> = linkEnum.getRecord<string, any>(key);
     
@@ -196,7 +196,7 @@ export class DiyServiceImplService {
                     for (const diyPage of pageList) {
                         const child: Record<string, any> = new Record<string, any>();
                         child.put("name", path.basename(diyPage));
-                        child.put("title", diyPage.getPageTitle());
+                        child.put("title", diyPage.pageTitle);
                         child.put("url", "/app/pages/index/diy?id=" + diyPage.id);
                         newChildList.push(child);
                     }
@@ -225,7 +225,7 @@ export class DiyServiceImplService {
             if (StringUtils.isNotBlank(path.basename(param))) {
                 const startConfig: StartUpPageConfigVo = this.coreDiyConfigService.getStartUpPageConfig(this.requestContext.siteId, path.basename(param));
                 if (startConfig != null) {
-                    if ("DIY_PAGE".equals(startConfig.getParent())) {
+                    if ("DIY_PAGE".equals(startConfig.parent)) {
                         const page: string = startConfig.page;
                         const id: number = number.parseInt(page.replace("/app/pages/index/diy?id=", ""));
                         info = this.info(id);
@@ -253,8 +253,8 @@ export class DiyServiceImplService {
             if (info != null) {
                 if (template.getRecord<string, any>(info.type) != null) {
                     const page: Record<string, any> = template.getRecord<string, any>(info.type);
-                    info.setTypeName(page.getStr("title"));
-                    info.setPage(page.getStr("page"));
+                    info.typeName = page.getStr("title");
+                    info.page = page.getStr("page");
                 }
             } else {
                 const time: number = Date.now() / 1000;
@@ -305,19 +305,19 @@ export class DiyServiceImplService {
     
                 info = new DiyPageInfoVo();
                 info.name = name;
-                info.setPageTitle(pageTitle); // 页面名称（用于后台展示）
+                info.pageTitle = pageTitle; // 页面名称（用于后台展示）
                 info.title = title; // 页面标题（用于前台展示）
                 info.type = type;
-                info.setTypeName(typeName);
-                info.setTemplate(templateName);
-                info.setPage(pageRoute);
-                info.setMode(mode);
+                info.typeName = typeName;
+                info.template = templateName;
+                info.page = pageRoute;
+                info.mode = mode;
                 info.value = value;
-                info.setIsDefault(isDefault);
+                info.isDefault = isDefault;
             }
     
-            info.setComponent(getComponentList(info.type));
-            info.setDomainUrl(this.coreSysConfigService.getSceneDomain(this.requestContext.siteId));
+            info.component = getComponentList(info.type);
+            info.domainUrl = this.coreSysConfigService.getSceneDomain(this.requestContext.siteId);
     
             // 处理全局模板数据
             const diyTemplate: Record<string, any> = new Record<string, any>();
@@ -328,7 +328,7 @@ export class DiyServiceImplService {
                 diyTemplate = getTemplate(templateParam);
                 if (diyTemplate != null && diyTemplate.containsKey(path.basename(info))) {
                     const templateInfo: Record<string, any> = diyTemplate.getRecord<string, any>(path.basename(info));
-                    info.setGlobal(templateInfo.getRecord<string, any>("global"));
+                    info.global = templateInfo.getRecord<string, any>("global");
                 }
             }
     
@@ -339,7 +339,7 @@ export class DiyServiceImplService {
    * getComponentList
    */
   async getComponentList(name: string): Promise<any> {
-    const data: Record<string, any> = ComponentEnum.getComponent();
+    const data: Record<string, any> = ComponentEnum.component;
     
             // 安全遍历顶层数据
             Iterator<String> categoryIterator = data.keySet().iterator();
@@ -409,7 +409,7 @@ export class DiyServiceImplService {
     const template: Record<string, any> = TemplateEnum.getTemplate(param);
     
             for (const key of template.keySet()) {
-                const pages: Record<string, any> = ObjectUtil.defaultIfNull(PagesEnum.getPages(key, param.getMode()), new Record<string, any>());
+                const pages: Record<string, any> = ObjectUtil.defaultIfNull(PagesEnum.getPages(key, param.mode), new Record<string, any>());
                 template.putByPath(key + ".template", pages);
             }
             //删除null值 防止序列化报错
@@ -421,7 +421,7 @@ export class DiyServiceImplService {
    * changeTemplate
    */
   async changeTemplate(value: StartUpPageConfigParam): Promise<any> {
-    this.this.coreDiyConfigService.setStartUpPageConfig(this.requestContext.siteId, value, value.type);
+    this.this.coreDiyConfigService.startUpPageConfig = this.requestContext.siteId, value, value.type;
   }
 
   /**
@@ -456,7 +456,7 @@ export class DiyServiceImplService {
                 useTemplate.set("page", startConfig.page);
                 useTemplate.set("action", startConfig.action);
                 useTemplate.set("url", startConfig.page);
-                useTemplate.set("parent", startConfig.getParent());
+                useTemplate.set("parent", startConfig.parent);
             } else if (info != null) {
                 useTemplate.set("id", info.id);
                 useTemplate.set("title", info.title);
@@ -475,7 +475,7 @@ export class DiyServiceImplService {
                 const route: DiyRouteListVo = otherPage.get(0);
                 useTemplate.set("title", route.title);
                 useTemplate.set("name", path.basename(route));
-                useTemplate.set("parent", route.getParent());
+                useTemplate.set("parent", route.parent);
                 useTemplate.set("action", route.action);
             }
     
@@ -483,9 +483,9 @@ export class DiyServiceImplService {
     
             const sceneDomain: SceneDomainVo = this.coreSysConfigService.getSceneDomain(this.requestContext.siteId);
             const domainUrl: Record<string, any> = new Record<string, any>();
-            domainUrl.put("wap_domain", sceneDomain.getWapDomain());
-            domainUrl.put("wap_url", sceneDomain.getWapUrl());
-            domainUrl.put("web_url", sceneDomain.getWebUrl());
+            domainUrl.put("wap_domain", sceneDomain.wapDomain);
+            domainUrl.put("wap_url", sceneDomain.wapUrl);
+            domainUrl.put("web_url", sceneDomain.webUrl);
             template.put("domain_url", domainUrl);
     
             return template;
@@ -531,9 +531,9 @@ export class DiyServiceImplService {
             const template: Record<string, any> = getTemplate(templateParam).getRecord<string, any>(param.key);
             if (template == null) return;
     
-            if (!param.getAddon().isEmpty()) {
+            if (!param.addon.isEmpty()) {
                 const addonTemplateParam: TemplateParam = new TemplateParam();
-                addonTemplateParam.setAddon(param.getAddon());
+                addonTemplateParam.addon = param.addon;
                 addonTemplateParam.type = param.type;
                 const addonTemplate: Record<string, any> = getTemplate(addonTemplateParam);
                 if (addonTemplate != null && (addonTemplate && addonTemplate.length > 0)) {
@@ -557,14 +557,14 @@ export class DiyServiceImplService {
                 RequestUtils.siteId = param.siteId;
                 const addParam: DiyPageParam = new DiyPageParam();
                 addParam.title = page.getStr("title", "");
-                addParam.setPageTitle(page.getStr("title", ""));
+                addParam.pageTitle = page.getStr("title", "");
                 addParam.name = addonFlag;
                 addParam.type = addonFlag;
-                addParam.setTemplate(pageKey);
+                addParam.template = pageKey;
                 addParam.value = page.getRecord<string, any>("data".toString());
-                addParam.setMode(page.getStr("mode", ""));
-                addParam.setIsDefault(1);
-                addParam.setIsChange(0);
+                addParam.mode = page.getStr("mode", "");
+                addParam.isDefault = 1;
+                addParam.isChange = 0;
                 this.push(addParam);
             } else {
                 if (path.basename(info) === "DIY_INDEX" && info.type === "DIY_INDEX") {
@@ -575,13 +575,13 @@ export class DiyServiceImplService {
                 }
             }
     
-            if (param.getIsStart() === 1) {
+            if (param.isStart === 1) {
                 const startPage: StartUpPageConfigParam = new StartUpPageConfigParam();
                 startPage.type = param.key;
-                startPage.setMode(page.getStr("mode", ""));
+                startPage.mode = page.getStr("mode", "");
                 startPage.title = page.getStr("title", "");
                 startPage.action = template.getStr("action", "");
-                startPage.setPage(template.getStr("page"));
+                startPage.page = template.getStr("page");
                 this.changeTemplate(startPage);
             }
   }
@@ -594,10 +594,10 @@ export class DiyServiceImplService {
             if (page == null) throw new BadRequestException("页面不存在");
     
             page.id = null;
-            page.setPageTitle(page.getPageTitle() + "_副本");
-            page.setIsChange(0);
-            page.setIsDefault(0);
-            page.setShare("");
+            page.pageTitle = page.pageTitle + "_副本";
+            page.isChange = 0;
+            page.isDefault = 0;
+            page.share = "";
             page.createTime = Date.now( / 1000);
             this.diyPageRepository.save(page);
   }
@@ -646,9 +646,9 @@ export class DiyServiceImplService {
                 setParam.siteId = siteId;
                 setParam.type = "index";
                 setParam.key = "DIY_INDEX";
-                setParam.setIsStart(isStart);
-                setParam.setMainApp(addon);
-                setParam.setAddon(v);
+                setParam.isStart = isStart;
+                setParam.mainApp = addon;
+                setParam.addon = v;
                 setDiyData(setParam);
     
                 setParam.type = "member_index";
@@ -676,7 +676,7 @@ export class DiyServiceImplService {
             for (const item of iPageRecords) {
                 const vo: DiyPageListVo = new DiyPageListVo();
                 Object.assign(vo, item);
-                vo.setTypeName(templates.getByPath(item.type + ".title", String.class));
+                vo.typeName = templates.getByPath(item.type + ".title", String.class);
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy/impl/diy-theme-service-impl.service.ts

@@ -23,7 +23,7 @@ export class DiyThemeServiceImplService {
             const themeDataList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", "app").eq("is_selected", 1));
             const themeData: Record<String, DiyTheme> = {};
             if ((themeDataList && themeDataList.length > 0)){
-                themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.getAddon(), theme => theme));
+                themeData = themeDataList.collect(/* Collectors已删除 */.toMap(theme => theme.addon, theme => theme));
             }
     
             const systemTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor("app");
@@ -46,8 +46,8 @@ export class DiyThemeServiceImplService {
             appTheme.putOpt("app", appThemeObj);
     
             const data: Record<string, any> = new Record<string, any>();
-            const appsAndAddons: Addon[] = siteCache.getApps();
-            appsAndAddons.addAll(siteCache.getSiteAddons());
+            const appsAndAddons: Addon[] = siteCache.apps;
+            appsAndAddons.addAll(siteCache.siteAddons);
             for (const value of appsAndAddons) {
                 const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(value.key);
                 if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_color")) {
@@ -70,7 +70,7 @@ export class DiyThemeServiceImplService {
                 }
             }
     
-            if ((!data || data.length === 0) || siteCache.getApps().size() > 1) {
+            if ((!data || data.length === 0) || siteCache.apps.size() > 1) {
                 const mergedData: Record<string, any> = new Record<string, any>();
                 for (const key of appTheme.keySet()) {
                     mergedData.putOpt(key, appTheme.get(key));
@@ -104,29 +104,29 @@ export class DiyThemeServiceImplService {
                     const saveData: DiyTheme = new DiyTheme();
                     saveData.siteId = siteId;
                     saveData.type = "addon";
-                    saveData.setAddon(addon.key);
+                    saveData.addon = addon.key;
                     saveData.title = diyTheme.title;
-                    saveData.setTheme(data.getTheme().toString());
-                    saveData.setNewTheme(data.getNewTheme().toString());
-                    saveData.setIsSelected(1);
+                    saveData.theme = data.theme.toString();
+                    saveData.newTheme = data.newTheme.toString();
+                    saveData.isSelected = 1;
                     saveData.updateTime = Date.now( / 1000);
                     addonSaveData.push(saveData);
                 }
             }
     
-            this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", data.getAddon()).eq("type", "addon").set("is_selected", 0));
+            this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", data.addon).eq("type", "addon").set("is_selected", 0));
     
             const model: DiyTheme = new DiyTheme();
             Object.assign(model, data);
-            model.setIsSelected(1);
+            model.isSelected = 1;
             model.updateTime = Date.now( / 1000);
             diyThemeMapper.updateById(model);
     
             if (!CommonUtils.isNotEmpty(addonSaveData)) {
                 for (const saveData of addonSaveData) {
     
-                    this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", saveData.getAddon()).eq("type", "addon").set("is_selected", 0));
-                    this.diyThemeRepository.save(saveData, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", saveData.getAddon()).eq("type", "addon").eq("title", saveData.title));
+                    this.diyThemeRepository.save(null, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", saveData.addon).eq("type", "addon").set("is_selected", 0));
+                    this.diyThemeRepository.save(saveData, new UpdateWrapper<DiyTheme>().eq("site_id",  siteId).eq("addon", saveData.addon).eq("type", "addon").eq("title", saveData.title));
                 }
             }
   }
@@ -135,15 +135,15 @@ export class DiyThemeServiceImplService {
    * getDefaultThemeColor
    */
   async getDefaultThemeColor(data: DiyThemeColorParam): Promise<any> {
-    const addon: string = data.getAddon();
+    const addon: string = data.addon;
             const themeList: DiyTheme[] = this.diyThemeRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("addon", addon));
             const voList: DiyThemeInfoVo[] = [];
             for (const theme of themeList) {
                 const vo: DiyThemeInfoVo = new DiyThemeInfoVo();
                 Object.assign(vo, theme);
-                const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(theme.getAddon());
+                const addonTheme: Record<string, any> = this.coreDiyService.getDefaultThemeColor(theme.addon);
                 if ((addonTheme && addonTheme.length > 0) && addonTheme.containsKey("theme_field")) {
-                    vo.setThemeField(addonTheme.getJSONArray("theme_field"));
+                    vo.themeField = addonTheme.getJSONArray("theme_field");
                 }
                 voList.push(vo);
             }
@@ -163,13 +163,13 @@ export class DiyThemeServiceImplService {
     
                     const diyTheme: DiyTheme = new DiyTheme();
                     diyTheme.siteId = siteId;
-                    diyTheme.setTheme("addon");
-                    diyTheme.setAddon(addon.key);
+                    diyTheme.theme = "addon";
+                    diyTheme.addon = addon.key;
                     diyTheme.title = data.title;
-                    diyTheme.setTheme(data.getTheme().toString());
-                    diyTheme.setNewTheme(data.getNewTheme().toString());
-                    diyTheme.setDefaultTheme(data.getDefaultTheme().toString());
-                    diyTheme.setThemeType("diy");
+                    diyTheme.theme = data.theme.toString();
+                    diyTheme.newTheme = data.newTheme.toString();
+                    diyTheme.defaultTheme = data.defaultTheme.toString();
+                    diyTheme.themeType = "diy";
                     diyTheme.createTime = Date.now( / 1000);
                     addonSaveData.push(diyTheme);
                 }
@@ -178,7 +178,7 @@ export class DiyThemeServiceImplService {
             const model: DiyTheme = new DiyTheme();
             Object.assign(model, data);
             model.type = "app";
-            model.setThemeType("diy");
+            model.themeType = "diy";
             model.createTime = Date.now( / 1000);
             addonSaveData.push(model);
             if (CommonUtils.isNotEmpty(addonSaveData)) {
@@ -204,8 +204,8 @@ export class DiyThemeServiceImplService {
                     saveData.id = diyTheme.id;
                     saveData.siteId = diyTheme.siteId;
                     saveData.title = diyTheme.title;
-                    saveData.setTheme(data.getTheme().toString());
-                    saveData.setNewTheme(data.getNewTheme().toString());
+                    saveData.theme = data.theme.toString();
+                    saveData.newTheme = data.newTheme.toString();
                     saveData.updateTime = Date.now( / 1000);
     
                     addonSaveData.push(saveData);
@@ -231,7 +231,7 @@ export class DiyThemeServiceImplService {
             if (CommonUtils.isEmpty(diyThemeInfo)) {
                 throw new BadRequestException("主题色不存在");
             }
-            if (diyThemeInfo.getThemeType() === "default") {
+            if (diyThemeInfo.themeType === "default") {
                 throw new BadRequestException("默认主题色不能删除");
             }
             this.diyThemeRepository.delete(diyThemeInfo);
@@ -243,7 +243,7 @@ export class DiyThemeServiceImplService {
   async checkDiyThemeTitleUnique(data: DiyThemeTitleParam): Promise<any> {
     any /* TODO: QueryWrapper<DiyTheme> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("title", data.title);
-            queryWrapper.eq("addon", data.getAddon());
+            queryWrapper.eq("addon", data.addon);
             if(CommonUtils.isNotEmpty(data.id))
             {
                 queryWrapper.ne("id", data.id);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-records-service-impl.service.ts

@@ -43,7 +43,7 @@ export class DiyFormRecordsServiceImplService {
             for (const vo of iPageRecords) {
                 const memberVo: Member = new Member();
                 Object.assign(memberVo, vo);
-                vo.setMember(memberVo);
+                vo.member = memberVo;
             }
             return PageResult.build(iPage);
   }
@@ -53,19 +53,19 @@ export class DiyFormRecordsServiceImplService {
    */
   async getFieldStatList(searchParam: DiyFormRecordsSearchParam): Promise<any> {
     const diyFormRecordsFieldsSearchParam: DiyFormRecordsFieldsSearchParam = new DiyFormRecordsFieldsSearchParam();
-            diyFormRecordsFieldsSearchParam.setFormId(searchParam.formId);
+            diyFormRecordsFieldsSearchParam.formId = searchParam.formId;
             const fieldsList: DiyFormFieldsListVo[] = this.diyFormService.getFieldsList(diyFormRecordsFieldsSearchParam);
     
             // 过滤简单字段列表
             const simpleTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope", "FormImage"};
             const simpleFieldList: DiyFormFieldsListVo[] = fieldsList
-                    .filter(e => ![simpleTypes].includes(e.getFieldType()))
+                    .filter(e => ![simpleTypes].includes(e.fieldType))
                     ;
     
             // 过滤 JSON 字段列表
             const jsonTypes: string[] = {"FormRadio", "FormCheckbox", "FormDateScope", "FormTimeScope"};
             const jsonFieldList: DiyFormFieldsListVo[] = fieldsList
-                    .filter(e => [jsonTypes].includes(e.getFieldType()))
+                    .filter(e => [jsonTypes].includes(e.fieldType))
                     ;
     
             const totalCount: number = 0;
@@ -73,8 +73,8 @@ export class DiyFormRecordsServiceImplService {
                 // 统计每个字段值的填写数量
                 any /* TODO: QueryWrapper<DiyFormRecordsFields> */ valueQueryWrapper = new QueryWrapper();
                 valueQueryWrapper.eq("site_id", this.requestContext.siteId)
-                        .eq("field_key", field.getFieldKey())
-                        .eq("field_type", field.getFieldType());
+                        .eq("field_key", field.fieldKey)
+                        .eq("field_type", field.fieldType);
                 if (searchParam.formId != null) {
                     valueQueryWrapper.eq("form_id", searchParam.formId);
                 }
@@ -91,7 +91,7 @@ export class DiyFormRecordsServiceImplService {
                         {
                             try{
                                 Class<?> clazz = ClassLoaderUtil.loadClass(driver);
-                                const obj: Object = clazz.getDeclaredConstructor().newInstance();
+                                const obj: Object = clazz.declaredConstructor.newInstance();
                                 const method: Method = clazz.getMethod("render", String.class, String.class);
                                 value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString()));
                             }catch (e){
@@ -106,8 +106,8 @@ export class DiyFormRecordsServiceImplService {
     
                 // 计算总数量
                 totalCount = this.diyFormRecordsFieldsRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ }))
-                        .eq("field_key", field.getFieldKey())
-                        .eq("field_type", field.getFieldType()));
+                        .eq("field_key", field.fieldKey)
+                        .eq("field_type", field.fieldType));
     
                 if (totalCount > 0) {
                     const totalPercent: number = 100;
@@ -123,7 +123,7 @@ export class DiyFormRecordsServiceImplService {
                         totalPercent = totalPercent - itemPercent;
                     }
                 }
-                field.setValueList(valueList);
+                field.valueList = valueList;
             }
     
             // 处理 JSON 字段列表
@@ -131,8 +131,8 @@ export class DiyFormRecordsServiceImplService {
                 // 查询字段记录
                 any /* TODO: QueryWrapper<DiyFormRecordsFields> */ fieldQueryWrapper = new QueryWrapper();
                 fieldQueryWrapper.eq("site_id", this.requestContext.siteId)
-                        .eq("field_key", field.getFieldKey())
-                        .eq("field_type", field.getFieldType());
+                        .eq("field_key", field.fieldKey)
+                        .eq("field_type", field.fieldType);
                 if (searchParam.formId != null) {
                     fieldQueryWrapper.eq("form_id", searchParam.formId);
                 }
@@ -147,7 +147,7 @@ export class DiyFormRecordsServiceImplService {
                         {
                             try{
                                 Class<?> clazz = ClassLoaderUtil.loadClass(driver);
-                                const obj: Object = clazz.getDeclaredConstructor().newInstance();
+                                const obj: Object = clazz.declaredConstructor.newInstance();
                                 const method: Method = clazz.getMethod("render", String.class, String.class);
                                 value.put("render_value", method.invoke(obj, value.get("field_value").toString(), value.get("field_type").toString()));
                             }catch (e){
@@ -204,7 +204,7 @@ export class DiyFormRecordsServiceImplService {
                         value.put("write_percent", itemPercent);
                         totalPercent = totalPercent - itemPercent;
                     }
-                    field.setValueList(valueList);
+                    field.valueList = valueList;
                 }
             }
     

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/diy_form/impl/diy-form-service-impl.service.ts

@@ -44,8 +44,8 @@ export class DiyFormServiceImplService {
             queryWrapper.eq("type", searchParam.type);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getAddon())) {
-            queryWrapper.eq("addon", searchParam.getAddon());
+            if (CommonUtils.isNotEmpty(searchParam.addon)) {
+            queryWrapper.eq("addon", searchParam.addon);
             }
     
             queryWrapper.orderByDesc("form_id");
@@ -80,8 +80,8 @@ export class DiyFormServiceImplService {
                 queryWrapper.eq("type", searchParam.type);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getAddon())) {
-                queryWrapper.eq("addon", searchParam.getAddon());
+            if (CommonUtils.isNotEmpty(searchParam.addon)) {
+                queryWrapper.eq("addon", searchParam.addon);
             }
             if (CommonUtils.isNotEmpty(searchParam.status)) {
                 queryWrapper.eq("status", searchParam.status);
@@ -136,23 +136,23 @@ export class DiyFormServiceImplService {
   async add(addParam: DiyFormParam): Promise<any> {
     const model: DiyForm = new DiyForm();
     
-            model.setPageTitle(addParam.getPageTitle());
+            model.pageTitle = addParam.pageTitle;
             model.title = addParam.title;
             model.type = addParam.type;
             model.status = 1;
-            model.setTemplate(addParam.getTemplate());
+            model.template = addParam.template;
             model.value = addParam.value;
             const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum();
             const type: Record<string, any> = diyFormTypeEnum.getType(addParam.type);
             if(type.containsKey("addon"))
             {
-                model.setAddon(type.getStr("addon"));
+                model.addon = type.getStr("addon");
             }else{
-                model.setAddon("");
+                model.addon = "";
             }
     
-            model.setShare(addParam.getShare());
-            model.setRemark(addParam.getRemark());
+            model.share = addParam.share;
+            model.remark = addParam.remark;
             model.siteId = this.requestContext.siteId;
             model.createTime = Date.now( / 1000);
             model.updateTime = Date.now( / 1000);
@@ -172,27 +172,27 @@ export class DiyFormServiceImplService {
     
                     const fieldRecord: DiyFormFields = new DiyFormFields();
                     fieldRecord.siteId = this.requestContext.siteId;
-                    fieldRecord.setFormId(model.formId);
-                    fieldRecord.setFieldKey(component.get("id").toString());
-                    fieldRecord.setFieldType(componentName);
-                    fieldRecord.setFieldName(field.containsKey("name") ? field.getStr("name") : "");
+                    fieldRecord.formId = model.formId;
+                    fieldRecord.fieldKey = component.get("id".toString());
+                    fieldRecord.fieldType = componentName;
+                    fieldRecord.fieldName = field.containsKey("name" ? field.getStr("name") : "");
                     if(field.containsKey("remark"))
                     {
                         const remark: Record<string, any> = field.getRecord<string, any>("remark");
                         if(remark.containsKey("text"))
                         {
-                            fieldRecord.setFieldRemark(remark.getStr("text"));
+                            fieldRecord.fieldRemark = remark.getStr("text");
                         }else{
-                            fieldRecord.setFieldRemark("");
+                            fieldRecord.fieldRemark = "";
                         }
                     }else{
-                        fieldRecord.setFieldRemark("");
+                        fieldRecord.fieldRemark = "";
                     }
-                    fieldRecord.setFieldDefault(field.containsKey("default") ? field.get("default").toString() : "");
-                    fieldRecord.setFieldRequired(field.containsKey("required") ? field.getInt("required") : 0);
-                    fieldRecord.setFieldHidden(component.getInt("isHidden"));
-                    fieldRecord.setFieldUnique(field.containsKey("unique") ? field.getInt("unique") : 0);
-                    fieldRecord.setPrivacyProtection(field.containsKey("privacyProtection") ? field.getInt("privacyProtection") : 0);
+                    fieldRecord.fieldDefault = field.containsKey("default" ? field.get("default").toString() : "");
+                    fieldRecord.fieldRequired = field.containsKey("required" ? field.getInt("required") : 0);
+                    fieldRecord.fieldHidden = component.getInt("isHidden");
+                    fieldRecord.fieldUnique = field.containsKey("unique" ? field.getInt("unique") : 0);
+                    fieldRecord.privacyProtection = field.containsKey("privacyProtection" ? field.getInt("privacyProtection") : 0);
                     fieldRecord.createTime = Date.now( / 1000);
                     fieldRecord.updateTime = Date.now( / 1000);
                     diyFormFields.push(fieldRecord);
@@ -204,13 +204,13 @@ export class DiyFormServiceImplService {
     
             const writeParam: DiyFormWriteConfigParam = new DiyFormWriteConfigParam();
             writeParam.siteId = this.requestContext.siteId;
-            writeParam.setFormId(model.formId);
+            writeParam.formId = model.formId;
             // 初始化表单填写配置
             this.coreDiyFormConfigService.addWriteConfig(writeParam);
     
             const submitConfigParam: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam();
             submitConfigParam.siteId = this.requestContext.siteId;
-            submitConfigParam.setFormId(model.formId);
+            submitConfigParam.formId = model.formId;
             // 初始化表单提交成功页配置
             this.coreDiyFormConfigService.addSubmitConfig(submitConfigParam);
     
@@ -226,8 +226,8 @@ export class DiyFormServiceImplService {
     
             if (!model) throw new BadRequestException("万能表单不存在");
             model.title = editParam.title;
-            model.setPageTitle(editParam.getPageTitle());
-            model.setTemplate(editParam.getTemplate());
+            model.pageTitle = editParam.pageTitle;
+            model.template = editParam.template;
             model.value = editParam.value;
             model.updateTime = Date.now( / 1000);
             diyFormMapper.updateById(model);
@@ -249,27 +249,27 @@ export class DiyFormServiceImplService {
     
                     const fieldRecord: DiyFormFields = new DiyFormFields();
                     fieldRecord.siteId = this.requestContext.siteId;
-                    fieldRecord.setFormId(model.formId);
-                    fieldRecord.setFieldKey(component.get("id").toString());
-                    fieldRecord.setFieldType(componentName);
-                    fieldRecord.setFieldName(field.containsKey("name") ? field.getStr("name") : "");
+                    fieldRecord.formId = model.formId;
+                    fieldRecord.fieldKey = component.get("id".toString());
+                    fieldRecord.fieldType = componentName;
+                    fieldRecord.fieldName = field.containsKey("name" ? field.getStr("name") : "");
                     if(field.containsKey("remark"))
                     {
                         const remark: Record<string, any> = field.getRecord<string, any>("remark");
                         if(remark.containsKey("text"))
                         {
-                            fieldRecord.setFieldRemark(remark.getStr("text"));
+                            fieldRecord.fieldRemark = remark.getStr("text");
                         }else{
-                            fieldRecord.setFieldRemark("");
+                            fieldRecord.fieldRemark = "";
                         }
                     }else{
-                        fieldRecord.setFieldRemark("");
+                        fieldRecord.fieldRemark = "";
                     }
-                    fieldRecord.setFieldDefault(field.containsKey("default") ? field.get("default").toString() : "");
-                    fieldRecord.setFieldRequired(field.containsKey("required") ? field.getInt("required") : 0);
-                    fieldRecord.setFieldHidden(component.getInt("isHidden"));
-                    fieldRecord.setFieldUnique(field.containsKey("unique") ? field.getInt("unique") : 0);
-                    fieldRecord.setPrivacyProtection(field.containsKey("privacyProtection") ? field.getInt("privacyProtection") : 0);
+                    fieldRecord.fieldDefault = field.containsKey("default" ? field.get("default").toString() : "");
+                    fieldRecord.fieldRequired = field.containsKey("required" ? field.getInt("required") : 0);
+                    fieldRecord.fieldHidden = component.getInt("isHidden");
+                    fieldRecord.fieldUnique = field.containsKey("unique" ? field.getInt("unique") : 0);
+                    fieldRecord.privacyProtection = field.containsKey("privacyProtection" ? field.getInt("privacyProtection") : 0);
                     fieldRecord.updateTime = Date.now( / 1000);
     
                     if(formFieldsListMap.containsKey(component.getStr("id")))
@@ -306,13 +306,13 @@ export class DiyFormServiceImplService {
             //事件检测是否可以被删除
             DiyFormDelBeforeEventDefiner.const event: DiyFormDelBeforeEvent = new DiyFormDelBeforeEventDefiner.DiyFormDelBeforeEvent();
             for (const formId of formIds) {
-                event.setFormId(formId);
+                event.formId = formId;
                 event.siteId = this.requestContext.siteId;
                 const result: DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
                 for (DiyFormDelBeforeEventDefiner.DiyFromDelBeforeResult res : result) {
                     if(CommonUtils.isNotEmpty(res))
                     {
-                        if(!res.getAllowOperate())  throw new BadRequestException("存在正在使用的表单，无法删除");
+                        if(!res.allowOperate)  throw new BadRequestException("存在正在使用的表单，无法删除");
                     }
                 }
             }
@@ -338,7 +338,7 @@ export class DiyFormServiceImplService {
                 const diyFormTypeEnum: DiyFormTypeEnum = new DiyFormTypeEnum();
                 const currentType: Record<string, any> = diyFormTypeEnum.getType(data.type);
                 const typeName: string = currentType.getStr("title");
-                data.setTypeName(typeName);
+                data.typeName = typeName;
             } else {
                 if (CommonUtils.isEmpty(params.type)) {
                     throw new BadRequestException("DIY_FORM_TYPE_NOT_EXIST");
@@ -354,19 +354,19 @@ export class DiyFormServiceImplService {
                 const value: string = "";
     
                 data = new DiyFormInfoVo();
-                data.setFormId(0);
-                data.setPageTitle(pageTitle);
+                data.formId = 0;
+                data.pageTitle = pageTitle;
                 data.title = typeName;
                 data.type = type;
-                data.setTypeName(typeName);
+                data.typeName = typeName;
                 data.value = value;
                 data.status = 1;
             }
     
             const initVo: DiyFormInitVo = new DiyFormInitVo();
             Object.assign(initVo, data);
-            initVo.setComponent(getComponentList(data.type));
-            initVo.setDomainUrl(this.systemConfigService.getSceneDomain(this.requestContext.siteId));
+            initVo.component = getComponentList(data.type);
+            initVo.domainUrl = this.systemConfigService.getSceneDomain(this.requestContext.siteId);
             return initVo;
   }
 
@@ -375,7 +375,7 @@ export class DiyFormServiceImplService {
    */
   async modifyShare(formId: number, share: string): Promise<any> {
     const diyForm: DiyForm = new DiyForm();
-            diyForm.setShare(share);
+            diyForm.share = share;
             this.diyFormRepository.save(diyForm, /* TODO: any /* TODO: QueryWrapper<DiyForm> */需改写为TypeORM的where条件对象 */.eq("form_id", formId).eq("site_id", this.requestContext.siteId));
             return true;
   }
@@ -385,7 +385,7 @@ export class DiyFormServiceImplService {
    */
   async getComponentList(type: string): Promise<any> {
     const formComponentEunm: DiyFormComponentEnum = new DiyFormComponentEnum();
-            const formComponentList: Record<string, any> = formComponentEunm.getComponent();
+            const formComponentList: Record<string, any> = formComponentEunm.component;
             for (const formComponentObj of formComponentList.keySet()) {
                 const formComponent: Record<string, any> = formComponentList.getRecord<string, any>(formComponentObj);
                 const list: Record<string, any> = formComponent.getRecord<string, any>("list");
@@ -438,11 +438,11 @@ export class DiyFormServiceImplService {
             // 复制表单信息
             const newDiyForm: DiyForm = new DiyForm();
             Object.assign(newDiyForm, diyForm);
-            newDiyForm.setFormId(null); // 清空原有的 form_id，让数据库自动生成新的
-            newDiyForm.setPageTitle(newDiyForm.getPageTitle() + "_副本");
+            newDiyForm.formId = null; // 清空原有的 form_id，让数据库自动生成新的
+            newDiyForm.pageTitle = newDiyForm.pageTitle + "_副本";
             newDiyForm.status = 0;
-            newDiyForm.setShare("");
-            newDiyForm.setWriteNum(0);
+            newDiyForm.share = "";
+            newDiyForm.writeNum = 0;
             const currentTime: number = Date.now() / 1000;
             newDiyForm.createTime = currentTime;
             newDiyForm.updateTime = currentTime;
@@ -457,9 +457,9 @@ export class DiyFormServiceImplService {
                 for (const item of diyFormFields) {
                     const newField: DiyFormFields = new DiyFormFields();
                     Object.assign(newField, item);
-                    newField.setFieldId(null); // 清空原有的 field_id，让数据库自动生成新的
-                    newField.setFormId(newFormId);
-                    newField.setWriteNum(0);
+                    newField.fieldId = null; // 清空原有的 field_id，让数据库自动生成新的
+                    newField.formId = newFormId;
+                    newField.writeNum = 0;
                     newField.createTime = currentTime;
                     newField.updateTime = currentTime;
                     newFormFieldList.push(newField);
@@ -473,7 +473,7 @@ export class DiyFormServiceImplService {
             if (!CommonUtils.isEmpty(diyFormWriteConfig)) {
                 const newWriteConfig: DiyFormWriteConfigParam = new DiyFormWriteConfigParam();
                 Object.assign(newWriteConfig, diyFormWriteConfig);
-                newWriteConfig.setFormId(newFormId);
+                newWriteConfig.formId = newFormId;
                 newWriteConfig.id = null;
                 this.coreDiyFormConfigService.addWriteConfig(newWriteConfig);
             }
@@ -482,7 +482,7 @@ export class DiyFormServiceImplService {
             if (!CommonUtils.isEmpty(diyFormSubmitConfig)) {
                 const newSubmitConfig: DiyFormSubmitConfigParam = new DiyFormSubmitConfigParam();
                 Object.assign(newSubmitConfig, diyFormSubmitConfig);
-                newSubmitConfig.setFormId(newFormId);
+                newSubmitConfig.formId = newFormId;
                 newSubmitConfig.id = null;
                 this.coreDiyFormConfigService.addSubmitConfig(newSubmitConfig);
             }
@@ -495,7 +495,7 @@ export class DiyFormServiceImplService {
    */
   async getTemplate(params: DiyFormTemplateParam): Promise<any> {
     const diyFormTemplateEnum: DiyFormTemplateEnum = new DiyFormTemplateEnum();
-            return diyFormTemplateEnum.getTemplate(params.type, params.getTemplateKey());
+            return diyFormTemplateEnum.getTemplate(params.type, params.templateKey);
   }
 
   /**
@@ -541,7 +541,7 @@ export class DiyFormServiceImplService {
                 formQueryWrapper.eq("form_id", formId);
                 const diyForm: DiyForm = this.diyFormRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
                 if (diyForm != null) {
-                    diyForm.setWriteNum(diyForm.getWriteNum() - 1);
+                    diyForm.writeNum = diyForm.writeNum - 1;
                     diyFormMapper.updateById(diyForm);
                 }
     
@@ -571,11 +571,11 @@ export class DiyFormServiceImplService {
     any /* TODO: QueryWrapper<DiyFormFields> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId)
                     .eq("form_id", diyFormRecordsFieldsSearchParam.formId);
-            if(diyFormRecordsFieldsSearchParam.getSort() === "asc")
+            if(diyFormRecordsFieldsSearchParam.sort === "asc")
             {
-                queryWrapper.orderByAsc(diyFormRecordsFieldsSearchParam.getOrder());
+                queryWrapper.orderByAsc(diyFormRecordsFieldsSearchParam.order);
             }else {
-                queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.getOrder());
+                queryWrapper.orderByDesc(diyFormRecordsFieldsSearchParam.order);
             }
             const list: DiyFormFields[] = this.diyFormFieldsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
             const listVo: DiyFormFieldsListVo[] = [];
@@ -595,10 +595,10 @@ export class DiyFormServiceImplService {
             const limit: number = pageParam.limit;
             // 验证表单ID集合
             const verifyFormIds: number[] = [];
-            if (param.getVerifyFormIds() != null && !param.getVerifyFormIds().isEmpty()) {
+            if (param.verifyFormIds != null && !param.verifyFormIds.isEmpty()) {
                 // 查询存在的表单ID
                 const existForms: DiyForm[] = this.diyFormRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
-                                .in("form_id", param.getVerifyFormIds())
+                                .in("form_id", param.verifyFormIds)
                 );
     
                 verifyFormIds = existForms
@@ -619,8 +619,8 @@ export class DiyFormServiceImplService {
             if (StringUtils.hasText(param.type)) {
                 queryWrapper.eq(DiyForm::getType, param.type);
             }
-            if (StringUtils.hasText(param.getAddon())) {
-                queryWrapper.eq(DiyForm::getAddon, param.getAddon());
+            if (StringUtils.hasText(param.addon)) {
+                queryWrapper.eq(DiyForm::getAddon, param.addon);
             }
     
             // 分页查询
@@ -635,10 +635,10 @@ export class DiyFormServiceImplService {
                 Object.assign(diyFormInfoVo, item);
                 const currentType: Record<string, any> = new DiyFormTypeEnum().getType(item.type);
                 const typeName: string = currentType.getStr("title");
-                diyFormInfoVo.setTypeName(typeName);
-                const addon: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getKey, item.getAddon()));
+                diyFormInfoVo.typeName = typeName;
+                const addon: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq(Addon::getKey, item.addon));
                 const addonName: string = CommonUtils.isNotEmpty(addon) ? addon.title : "";
-                diyFormInfoVo.setAddonName(addonName);
+                diyFormInfoVo.addonName = addonName;
                 resultList.push(diyFormInfoVo);
             });
             return PageResult.build(page, limit, formPageTotal, resultList);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/generator/impl/generate-service-impl.service.ts

@@ -23,22 +23,22 @@ export class GenerateServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<GenerateTable> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("ngt");
+            queryWrapper.alias = "ngt";
             queryWrapper.select("ngt.id, ngt.table_name, ngt.table_content, ngt.module_name, ngt.class_name, ngt.create_time, ngt.edit_type, ngt.addon_name, ngt.order_type, ngt.parent_menu, ngt.relations, ngt.synchronous_number, na.title, na.`key`");
             queryWrapper.leftJoin("?_addon na ON na.`key` = ngt.addon_name".replace("?_", this.appConfig.tablePrefix));
-            if (CommonUtils.isNotEmpty(searchParam.getTableName())) {
-                queryWrapper.like("ngt.table_name", searchParam.getTableName());
+            if (CommonUtils.isNotEmpty(searchParam.tableName)) {
+                queryWrapper.like("ngt.table_name", searchParam.tableName);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getTableContent())) {
-                queryWrapper.eq("ngt.table_content", searchParam.getTableContent());
+            if (CommonUtils.isNotEmpty(searchParam.tableContent)) {
+                queryWrapper.eq("ngt.table_content", searchParam.tableContent);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getAddonName())) {
-                if (searchParam.getAddonName() === "2") {
+            if (CommonUtils.isNotEmpty(searchParam.addonName)) {
+                if (searchParam.addonName === "2") {
                     queryWrapper.eq("ngt.addon_name", "");
                 } else {
-                    queryWrapper.like("ngt.addon_name", searchParam.getAddonName());
+                    queryWrapper.like("ngt.addon_name", searchParam.addonName);
                 }
             }
     
@@ -57,21 +57,21 @@ export class GenerateServiceImplService {
             const vo: GenerateDetailVo = new GenerateDetailVo();
             Object.assign(vo, generateTable);
     
-            if (vo.getOrderType() != 0) {
+            if (vo.orderType != 0) {
                 const orderColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_order", 1));
                 if (CommonUtils.isNotEmpty(orderColumn)) {
-                    vo.setOrderColumnName(orderColumn.getColumnName());
+                    vo.orderColumnName = orderColumn.columnName;
                 } else {
-                    vo.setOrderColumnName("");
+                    vo.orderColumnName = "";
                 }
             }
             const deleteColumn: GenerateColumn = this.generateColumnRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("is_delete", 1));
             if (CommonUtils.isNotEmpty(deleteColumn)) {
-                vo.setDeleteColumnName(deleteColumn.getColumnName());
-                vo.setIsDelete(1);
+                vo.deleteColumnName = deleteColumn.columnName;
+                vo.isDelete = 1;
             } else {
-                vo.setDeleteColumnName("");
-                vo.setIsDelete(0);
+                vo.deleteColumnName = "";
+                vo.isDelete = 0;
             }
             const columnList: GenerateColumn[] = this.generateColumnRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
             if (CommonUtils.isNotEmpty(columnList)) {
@@ -79,65 +79,65 @@ export class GenerateServiceImplService {
                 for (const column of columnList) {
                     const generateColumnVo: GenerateColumnVo = new GenerateColumnVo();
                     Object.assign(generateColumnVo, column);
-                    if (column.getViewType() === "number") {
-                        if (!column.getValidateType().isEmpty()) {
-                            if (column.getValidateType().startsWith("[")) {
-                                const numValidate: JSONArray = JSONUtil.parseArray(column.getValidateType());
+                    if (column.viewType === "number") {
+                        if (!column.validateType.isEmpty()) {
+                            if (column.validateType.startsWith("[")) {
+                                const numValidate: JSONArray = JSONUtil.parseArray(column.validateType);
                                 if (numValidate.get(0).toString() === "between") {
-                                    generateColumnVo.setViewMax(JSONUtil.parseArray(numValidate.get(1)).get(1).toString());
-                                    generateColumnVo.setViewMin(JSONUtil.parseArray(numValidate.get(1)).get(0).toString());
+                                    generateColumnVo.viewMax = JSONUtil.parseArray(numValidate.get(1).get(1).toString());
+                                    generateColumnVo.viewMin = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
                                 } else if (numValidate.get(0).toString() === "max") {
-                                    generateColumnVo.setViewMax(JSONUtil.parseArray(numValidate.get(1)).get(0).toString());
+                                    generateColumnVo.viewMax = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
                                 } else if (numValidate.get(0).toString() === "min") {
-                                    generateColumnVo.setViewMin(JSONUtil.parseArray(numValidate.get(1)).get(0).toString());
+                                    generateColumnVo.viewMin = JSONUtil.parseArray(numValidate.get(1).get(0).toString());
                                 } else {
-                                    generateColumnVo.setViewMax("100");
-                                    generateColumnVo.setViewMin("0");
+                                    generateColumnVo.viewMax = "100";
+                                    generateColumnVo.viewMin = "0";
                                 }
                             } else {
-                                generateColumnVo.setViewMax("100");
-                                generateColumnVo.setViewMin("0");
+                                generateColumnVo.viewMax = "100";
+                                generateColumnVo.viewMin = "0";
                             }
     
                         } else {
-                            generateColumnVo.setViewMax("100");
-                            generateColumnVo.setViewMin("0");
+                            generateColumnVo.viewMax = "100";
+                            generateColumnVo.viewMin = "0";
                         }
                     } else {
-                        generateColumnVo.setViewMax("");
-                        generateColumnVo.setViewMin("");
+                        generateColumnVo.viewMax = "";
+                        generateColumnVo.viewMin = "";
                     }
-                    if (!column.getValidateType().isEmpty()) {
-                        if (column.getValidateType().startsWith("[")) {
-                            const num1Validate: JSONArray = JSONUtil.parseArray(column.getValidateType());
+                    if (!column.validateType.isEmpty()) {
+                        if (column.validateType.startsWith("[")) {
+                            const num1Validate: JSONArray = JSONUtil.parseArray(column.validateType);
                             if (num1Validate.get(0).toString() === "between") {
-                                generateColumnVo.setMaxNumber(JSONUtil.parseArray(num1Validate.get(1)).get(1).toString());
-                                generateColumnVo.setMinNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString());
+                                generateColumnVo.maxNumber = JSONUtil.parseArray(num1Validate.get(1).get(1).toString());
+                                generateColumnVo.minNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
                             } else if (num1Validate.get(0).toString() === "max") {
-                                generateColumnVo.setMaxNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString());
+                                generateColumnVo.maxNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
                             } else if (num1Validate.get(0).toString() === "min") {
-                                generateColumnVo.setMinNumber(JSONUtil.parseArray(num1Validate.get(1)).get(0).toString());
+                                generateColumnVo.minNumber = JSONUtil.parseArray(num1Validate.get(1).get(0).toString());
                             } else {
-                                generateColumnVo.setMaxNumber("120");
-                                generateColumnVo.setMinNumber("1");
+                                generateColumnVo.maxNumber = "120";
+                                generateColumnVo.minNumber = "1";
                             }
                         } else {
-                            generateColumnVo.setMaxNumber("120");
-                            generateColumnVo.setMinNumber("1");
+                            generateColumnVo.maxNumber = "120";
+                            generateColumnVo.minNumber = "1";
                         }
     
                     } else {
-                        generateColumnVo.setMaxNumber("120");
-                        generateColumnVo.setMinNumber("1");
+                        generateColumnVo.maxNumber = "120";
+                        generateColumnVo.minNumber = "1";
                     }
-                    if (!column.getModel().isEmpty()) {
-                        generateColumnVo.setSelectType(2);
+                    if (!column.model.isEmpty()) {
+                        generateColumnVo.selectType = 2;
                     } else {
-                        generateColumnVo.setSelectType(1);
+                        generateColumnVo.selectType = 1;
                     }
                     columnVoList.push(generateColumnVo);
                 }
-                vo.setTableColumn(columnVoList);
+                vo.tableColumn = columnVoList;
             }
             return vo;
   }
@@ -148,8 +148,8 @@ export class GenerateServiceImplService {
   async add(generateParam: GenerateParam): Promise<any> {
     const sql: string = "SHOW TABLE STATUS WHERE 1=1 ";
             const tablePrefix: string = this.appConfig.tablePrefix;
-            if (!generateParam.getTableName().isEmpty()) {
-                sql += " AND Name = '" + generateParam.getTableName() + "'";
+            if (!generateParam.tableName.isEmpty()) {
+                sql += " AND Name = '" + generateParam.tableName + "'";
             }
             List<Record<String, Object>> listData = jdbcTemplate.queryForList(sql);
             if (CommonUtils.isEmpty(listData)) throw new AdminException("数据表不存在");
@@ -159,11 +159,11 @@ export class GenerateServiceImplService {
     
             //添加生成表数据
             const generateTable: GenerateTable = new GenerateTable();
-            generateTable.setTableName(tableName);
-            generateTable.setTableContent(table.get("Comment").toString());
-            generateTable.setClassName(tableName);
+            generateTable.tableName = tableName;
+            generateTable.tableContent = table.get("Comment".toString());
+            generateTable.className = tableName;
             generateTable.createTime = Date.now( / 1000);
-            generateTable.setModuleName(tableName);
+            generateTable.moduleName = tableName;
             this.generateTableRepository.save(generateTable);
     
             //添加生成字段数据
@@ -173,31 +173,31 @@ export class GenerateServiceImplService {
             for (Record<String, Object> column : columns) {
                 const generateColumn: GenerateColumn = new GenerateColumn();
     
-                generateColumn.setIsRequired(0);
+                generateColumn.isRequired = 0;
                 const defaultColumn: string[] = {"id", "create_time", "update_time"};
                 if (column.get("IS_NULLABLE").toString() === "NO" && !column.get("COLUMN_KEY").equals("PRI") && [defaultColumn].includes(column.get("COLUMN_NAME").toString())) {
-                    generateColumn.setIsRequired(1);
+                    generateColumn.isRequired = 1;
                 }
     
-                generateColumn.setTableId(id);
-                generateColumn.setColumnName(column.get("COLUMN_NAME").toString());
-                generateColumn.setColumnType(getDbFieldType(column.get("DATA_TYPE").toString()));
-                if (generateColumn.getColumnType() === "number" && generateColumn.getColumnName().includes("time")) {
-                    generateColumn.setColumnType("number");
+                generateColumn.tableId = id;
+                generateColumn.columnName = column.get("COLUMN_NAME".toString());
+                generateColumn.columnType = getDbFieldType(column.get("DATA_TYPE".toString()));
+                if (generateColumn.columnType === "number" && generateColumn.columnName.includes("time")) {
+                    generateColumn.columnType = "number";
                 }
-                generateColumn.setColumnComment(column.get("COLUMN_COMMENT").toString());
-                generateColumn.setIsPk(column.get("COLUMN_KEY").equals("PRI") ? 1 : 0);
-                generateColumn.setIsInsert([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1);
-                generateColumn.setIsUpdate([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1);
-                generateColumn.setIsLists([defaultColumn].includes(column.get("COLUMN_NAME").toString()) ? 0 : 1);
-                generateColumn.setIsDelete(0);
-                generateColumn.setQueryType("=");
-                generateColumn.setViewType("input");
-                generateColumn.setDictType("");
-                generateColumn.setAddon("");
-                generateColumn.setModel("");
-                generateColumn.setLabelKey("");
-                generateColumn.setValueKey("");
+                generateColumn.columnComment = column.get("COLUMN_COMMENT".toString());
+                generateColumn.isPk = column.get("COLUMN_KEY".equals("PRI") ? 1 : 0);
+                generateColumn.isInsert = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
+                generateColumn.isUpdate = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
+                generateColumn.isLists = [defaultColumn].includes(column.get("COLUMN_NAME".toString()) ? 0 : 1);
+                generateColumn.isDelete = 0;
+                generateColumn.queryType = "=";
+                generateColumn.viewType = "input";
+                generateColumn.dictType = "";
+                generateColumn.addon = "";
+                generateColumn.model = "";
+                generateColumn.labelKey = "";
+                generateColumn.valueKey = "";
                 generateColumn.createTime = Date.now( / 1000);
                 generateColumn.updateTime = Date.now( / 1000);
                 list.push(generateColumn);
@@ -214,56 +214,56 @@ export class GenerateServiceImplService {
     //添加生成表数据
             const generateTable: GenerateTable = new GenerateTable();
             generateTable.id = id;
-            generateTable.setTableName(generateParam.getTableName());
-            generateTable.setTableContent(generateParam.getTableContent());
-            generateTable.setModuleName(generateParam.getModuleName());
-            generateTable.setClassName(generateParam.getClassName());
-            generateTable.setEditType(generateParam.getEditType());
-            generateTable.setAddonName(generateParam.getAddonName());
-            generateTable.setOrderType(generateParam.getOrderType());
-            generateTable.setParentMenu(generateParam.getParentMenu());
-            generateTable.setRelations(generateParam.getRelations());
+            generateTable.tableName = generateParam.tableName;
+            generateTable.tableContent = generateParam.tableContent;
+            generateTable.moduleName = generateParam.moduleName;
+            generateTable.className = generateParam.className;
+            generateTable.editType = generateParam.editType;
+            generateTable.addonName = generateParam.addonName;
+            generateTable.orderType = generateParam.orderType;
+            generateTable.parentMenu = generateParam.parentMenu;
+            generateTable.relations = generateParam.relations;
             generateTableMapper.updateById(generateTable);
             //更新表字段
             this.generateColumnRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ }));
-            const columns: JSONArray = JSONUtil.parseArray(generateParam.getTableColumn());
+            const columns: JSONArray = JSONUtil.parseArray(generateParam.tableColumn);
             const list: GenerateColumn[] = [];
     
             for (const i of number = 0; i < columns.length; i++) {
                 const generateColumn: GenerateColumn = new GenerateColumn();
                 const column: Record<string, any> = columns.getRecord<string, any>(i);
-                generateColumn.setTableId(id);
-                generateColumn.setColumnName(column.getStr("column_name"));
-                generateColumn.setColumnComment(column.getStr("column_comment"));
-                generateColumn.setIsPk(column.getInt("is_pk"));
-                generateColumn.setIsRequired(column.getInt("is_required"));
-                generateColumn.setIsInsert(column.getInt("is_insert"));
-                generateColumn.setIsUpdate(column.getInt("is_update"));
-                generateColumn.setIsLists(column.getInt("is_lists"));
-                generateColumn.setIsSearch(column.getInt("is_search"));
-                generateColumn.setIsDelete(0);
-                generateColumn.setIsOrder(0);
-                generateColumn.setQueryType(column.getStr("query_type"));
-                generateColumn.setViewType(CommonUtils.isEmpty(column.getStr("view_type")) ? "input" : column.getStr("view_type"));
-                generateColumn.setDictType(CommonUtils.isEmpty(column.getStr("dict_type")) ? "" : column.getStr("dict_type"));
-                generateColumn.setAddon(CommonUtils.isEmpty(column.getStr("addon")) ? "" : column.getStr("addon"));
-                generateColumn.setModel(CommonUtils.isEmpty(column.getStr("model")) ? "" : column.getStr("model"));
-                generateColumn.setLabelKey(CommonUtils.isEmpty(column.getStr("label_key")) ? "" : column.getStr("label_key"));
-                generateColumn.setValueKey(CommonUtils.isEmpty(column.getStr("value_key")) ? "" : column.getStr("value_key"));
+                generateColumn.tableId = id;
+                generateColumn.columnName = column.getStr("column_name");
+                generateColumn.columnComment = column.getStr("column_comment");
+                generateColumn.isPk = column.getInt("is_pk");
+                generateColumn.isRequired = column.getInt("is_required");
+                generateColumn.isInsert = column.getInt("is_insert");
+                generateColumn.isUpdate = column.getInt("is_update");
+                generateColumn.isLists = column.getInt("is_lists");
+                generateColumn.isSearch = column.getInt("is_search");
+                generateColumn.isDelete = 0;
+                generateColumn.isOrder = 0;
+                generateColumn.queryType = column.getStr("query_type");
+                generateColumn.viewType = CommonUtils.isEmpty(column.getStr("view_type") ? "input" : column.getStr("view_type"));
+                generateColumn.dictType = CommonUtils.isEmpty(column.getStr("dict_type") ? "" : column.getStr("dict_type"));
+                generateColumn.addon = CommonUtils.isEmpty(column.getStr("addon") ? "" : column.getStr("addon"));
+                generateColumn.model = CommonUtils.isEmpty(column.getStr("model") ? "" : column.getStr("model"));
+                generateColumn.labelKey = CommonUtils.isEmpty(column.getStr("label_key") ? "" : column.getStr("label_key"));
+                generateColumn.valueKey = CommonUtils.isEmpty(column.getStr("value_key") ? "" : column.getStr("value_key"));
                 generateColumn.updateTime = Date.now( / 1000);
                 generateColumn.createTime = Date.now( / 1000);
-                generateColumn.setColumnType(CommonUtils.isEmpty(column.getStr("column_type")) ? "String" : column.getStr("column_type"));
-                generateColumn.setValidateType(CommonUtils.isEmpty(column.getStr("validate_type")) ? "" : column.getStr("validate_type"));
+                generateColumn.columnType = CommonUtils.isEmpty(column.getStr("column_type") ? "String" : column.getStr("column_type"));
+                generateColumn.validateType = CommonUtils.isEmpty(column.getStr("validate_type") ? "" : column.getStr("validate_type"));
                 //传入字段rule暂时不知含义，待定
     
-                if (generateParam.getIsDelete() == 1) {
-                    if (column.getStr("column_name").equals(generateParam.getDeleteColumnName())) {
-                        generateColumn.setIsDelete(1);
+                if (generateParam.isDelete == 1) {
+                    if (column.getStr("column_name").equals(generateParam.deleteColumnName)) {
+                        generateColumn.isDelete = 1;
                     }
                 }
-                if (generateParam.getOrderType() != 0) {
-                    if (column.getStr("column_name").equals(generateParam.getOrderColumnName())) {
-                        generateColumn.setIsOrder(1);
+                if (generateParam.orderType != 0) {
+                    if (column.getStr("column_name").equals(generateParam.orderColumnName)) {
+                        generateColumn.isOrder = 1;
                     }
                 }
     
@@ -272,17 +272,17 @@ export class GenerateServiceImplService {
                         const jsonArray: JSONArray = new JSONArray();
                         jsonArray.push("between");
                         jsonArray.push(new String[]{column.getStr("min_number"), column.getStr("max_number")});
-                        generateColumn.setValidateType(jsonArray.toString());
+                        generateColumn.validateType = jsonArray.toString();
                     } else if (column.getStr("validate_type").equals("max")) {
                         const jsonArray: JSONArray = new JSONArray();
                         jsonArray.push("max");
                         jsonArray.push(new String[]{column.getStr("max_number")});
-                        generateColumn.setValidateType(jsonArray.toString());
+                        generateColumn.validateType = jsonArray.toString();
                     } else if (column.getStr("validate_type").equals("min")) {
                         const jsonArray: JSONArray = new JSONArray();
                         jsonArray.push("min");
                         jsonArray.push(new String[]{column.getStr("min_number")});
-                        generateColumn.setValidateType(jsonArray.toString());
+                        generateColumn.validateType = jsonArray.toString();
                     }
                 }
     
@@ -290,10 +290,10 @@ export class GenerateServiceImplService {
                     const numJsonArray: JSONArray = new JSONArray();
                     numJsonArray.push("between");
                     numJsonArray.push(new String[]{column.getStr("view_min"), column.getStr("view_max")});
-                    generateColumn.setValidateType(numJsonArray.toString());
+                    generateColumn.validateType = numJsonArray.toString();
                 }
                 if (CommonUtils.isNotEmpty(column.getStr("model"))) {
-                    generateColumn.setDictType("");
+                    generateColumn.dictType = "";
                 }
                 list.push(generateColumn);
     
@@ -320,14 +320,14 @@ export class GenerateServiceImplService {
             const list: CoreGenerateTemplateVo[] = this.coreGenerateService.generateCode(generateTable, columnList);
     
             // 下载
-            if (generateCodeParam.getGenerateType() === "2") {
+            if (generateCodeParam.generateType === "2") {
                 const tempDir: string = this.appConfig.webRootDownResource + "upload/generate/";
                 const packageDir: string = tempDir + "package/";
                 FileTools.createDirs(packageDir);
                 FileUtil.clean(tempDir);
                 for (const coreGenerateTemplateVo of list) {
                     FileTools.createDirs(packageDir + coreGenerateTemplateVo.path);
-                    FileUtil.writeUtf8String(coreGenerateTemplateVo.data, packageDir + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.getFileName()));
+                    FileUtil.writeUtf8String(coreGenerateTemplateVo.data, packageDir + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.fileName));
                 }
                 const zipFile: string = ZipUtil.zip(packageDir, tempDir + "package.zip");
             } else {
@@ -338,7 +338,7 @@ export class GenerateServiceImplService {
                     if (coreGenerateTemplateVo.type === "sql") {
                         SQLScriptRunnerTools.execScript(coreGenerateTemplateVo.data);
                     } else {
-                        FileUtil.writeUtf8String(coreGenerateTemplateVo.data, this.appConfig.projectRoot + "/" + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.getFileName()));
+                        FileUtil.writeUtf8String(coreGenerateTemplateVo.data, this.appConfig.projectRoot + "/" + coreGenerateTemplateVo.getPath(, coreGenerateTemplateVo.fileName));
                     }
                 }
             }
@@ -355,10 +355,10 @@ export class GenerateServiceImplService {
             const voList: GeneratePreviewVo[] = [];
             for (const coreGenerateTemplateVo of columnList) {
                 const vo: GeneratePreviewVo = new GeneratePreviewVo();
-                vo.name = coreGenerateTemplateVo.getFileName();
+                vo.name = coreGenerateTemplateVo.fileName;
                 vo.type = coreGenerateTemplateVo.type;
-                vo.setContent(coreGenerateTemplateVo.data);
-                vo.setFileDir(coreGenerateTemplateVo.path + "/");
+                vo.content = coreGenerateTemplateVo.data;
+                vo.fileDir = coreGenerateTemplateVo.path + "/";
                 voList.push(vo);
             }
             return voList;
@@ -369,7 +369,7 @@ export class GenerateServiceImplService {
    */
   async getDbFieldType(type: string): Promise<any> {
     type = getDbType(type);
-            const map: Record<String, String[]> = SqlColumnEnum.getMap();
+            const map: Record<String, String[]> = SqlColumnEnum.map;
             const field: string = "";
             for (Map.Entry<String, String[]> entry : map.entrySet()) {
                 if ([entry.getValue(]).includes(type)) {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/home/impl/auth-site-service-impl.service.ts

@@ -24,24 +24,24 @@ export class AuthSiteServiceImplService {
     
             any /* TODO: QueryWrapper<Site> */ queryWrapper = new QueryWrapper();
             //查询条件判断组装
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords())) {
-                queryWrapper.like("site_name", searchParam.getKeywords()).or().like("site_id", searchParam.getKeywords());
+            if (CommonUtils.isNotEmpty(searchParam.keywords)) {
+                queryWrapper.like("site_name", searchParam.keywords).or().like("site_id", searchParam.keywords);
             }
     
             if (CommonUtils.isNotEmpty(searchParam.status)) {
                 queryWrapper.eq("status", searchParam.status);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getGroupId())) {
-                queryWrapper.eq("group_id", searchParam.getGroupId());
+            if (CommonUtils.isNotEmpty(searchParam.groupId)) {
+                queryWrapper.eq("group_id", searchParam.groupId);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getApp())) {
-                queryWrapper.like("app", searchParam.getApp());
+            if (CommonUtils.isNotEmpty(searchParam.app)) {
+                queryWrapper.like("app", searchParam.app);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getSiteDomain())) {
-                queryWrapper.like("site_domain", searchParam.getSiteDomain());
+            if (CommonUtils.isNotEmpty(searchParam.siteDomain)) {
+                queryWrapper.like("site_domain", searchParam.siteDomain);
             }
             queryWrapper.ne("app_type", "admin");
     
@@ -72,9 +72,9 @@ export class AuthSiteServiceImplService {
                 }
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getExpireTime())) {
+            if (CommonUtils.isNotEmpty(searchParam.expireTime)) {
     
-                const expireTime: string[] = searchParam.getExpireTime();
+                const expireTime: string[] = searchParam.expireTime;
                 const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]);
                 console.log(startTime);
                 const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]);
@@ -90,10 +90,10 @@ export class AuthSiteServiceImplService {
                 }
             }
     
-            if(CommonUtils.isEmpty(searchParam.getSort())){
+            if(CommonUtils.isEmpty(searchParam.sort)){
                 queryWrapper.orderByDesc("create_time");
             }else{
-                queryWrapper.orderByDesc(searchParam.getSort());
+                queryWrapper.orderByDesc(searchParam.sort);
             }
     
             [Site[], number] iPage = this.siteRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -116,13 +116,13 @@ export class AuthSiteServiceImplService {
                     .leftJoin("?_site_group nsg ON ns.group_id = nsg.group_id".replace("?_", this.appConfig.tablePrefix));
             siteMPJQueryWrapper.eq("ns.site_id", id);
             const siteInfoVo: SiteInfoVo = siteMapper.selectJoinOne(SiteInfoVo.class, siteMPJQueryWrapper);
-            siteInfoVo.setAddonKeys(this.this.CoreSiteService.getAddonKeysBySiteId(siteInfoVo.siteId));
-            if(siteInfoVo.getAddonKeys().size()!=0){
-                siteInfoVo.setSiteAddons(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.ADDON.getCode())));
-                siteInfoVo.setApps(this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("type", AddonActionEnum.APP.getCode())));
+            siteInfoVo.addonKeys = this.this.CoreSiteService.getAddonKeysBySiteId(siteInfoVo.siteId);
+            if(siteInfoVo.addonKeys.size()!=0){
+                siteInfoVo.siteAddons = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", AddonActionEnum.ADDON.code)));
+                siteInfoVo.apps = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("type", AddonActionEnum.APP.code)));
             }else{
-                siteInfoVo.setSiteAddons([]);
-                siteInfoVo.setApps([]);
+                siteInfoVo.siteAddons = [];
+                siteInfoVo.apps = [];
             }
             return siteInfoVo;
   }
@@ -132,33 +132,33 @@ export class AuthSiteServiceImplService {
    */
   async add(addParam: SiteParam): Promise<any> {
     const model: Site = new Site();
-            model.setSiteName(addParam.getSiteName());
-            model.setGroupId(addParam.getGroupId());
-            model.setKeywords(addParam.getKeywords());
-            model.setAppType(addParam.appType);
-            //model.setLogo(UrlUtils.toRelativeUrl(addParam.getLogo()));
+            model.siteName = addParam.siteName;
+            model.groupId = addParam.groupId;
+            model.keywords = addParam.keywords;
+            model.appType = addParam.appType;
+            //model.logo = UrlUtils.toRelativeUrl(addParam.logo);
             model.desc = addParam.desc;
             model.status = addParam.status;
-            model.setLatitude(addParam.getLatitude());
-            model.setLongitude(addParam.getLongitude());
-            model.setProvinceId(addParam.getProvinceId());
-            model.setCityId(addParam.getCityId());
-            model.setDistrictId(addParam.getDistrictId());
-            model.setAddress(addParam.getAddress());
-            model.setFullAddress(addParam.getFullAddress());
-            model.setPhone(addParam.getPhone());
-            model.setBusinessHours(addParam.getBusinessHours());
+            model.latitude = addParam.latitude;
+            model.longitude = addParam.longitude;
+            model.provinceId = addParam.provinceId;
+            model.cityId = addParam.cityId;
+            model.districtId = addParam.districtId;
+            model.address = addParam.address;
+            model.fullAddress = addParam.fullAddress;
+            model.phone = addParam.phone;
+            model.businessHours = addParam.businessHours;
             model.createTime = Date.now( / 1000);
-            model.setExpireTime(addParam.getExpireTime());
-            model.setFrontEndName(addParam.getFrontEndName());
-            model.setFrontEndLogo(addParam.getFrontEndLogo());
-            model.setFrontEndIcon(addParam.getFrontEndIcon());
+            model.expireTime = addParam.expireTime;
+            model.frontEndName = addParam.frontEndName;
+            model.frontEndLogo = addParam.frontEndLogo;
+            model.frontEndIcon = addParam.frontEndIcon;
             model.icon = addParam.icon;
-            model.setMemberNo(addParam.getMemberNo());
-            model.setApp(addParam.getApp());
-            model.setAddons(addParam.getAddons());
-            model.setInitalledAddon(addParam.getInitalledAddon());
-            model.setSiteDomain(addParam.getSiteDomain());
+            model.memberNo = addParam.memberNo;
+            model.app = addParam.app;
+            model.addons = addParam.addons;
+            model.initalledAddon = addParam.initalledAddon;
+            model.siteDomain = addParam.siteDomain;
             this.siteRepository.save(model);
   }
 
@@ -171,32 +171,32 @@ export class AuthSiteServiceImplService {
     
             if (!model) throw new BadRequestException("数据不存在!");
             model.siteId = id;
-            model.setSiteName(editParam.getSiteName());
-            model.setGroupId(editParam.getGroupId());
-            model.setKeywords(editParam.getKeywords());
-            model.setAppType(editParam.appType);
-            //model.setLogo(UrlUtils.toRelativeUrl(editParam.getLogo()));
+            model.siteName = editParam.siteName;
+            model.groupId = editParam.groupId;
+            model.keywords = editParam.keywords;
+            model.appType = editParam.appType;
+            //model.logo = UrlUtils.toRelativeUrl(editParam.logo);
             model.desc = editParam.desc;
             model.status = editParam.status;
-            model.setLatitude(editParam.getLatitude());
-            model.setLongitude(editParam.getLongitude());
-            model.setProvinceId(editParam.getProvinceId());
-            model.setCityId(editParam.getCityId());
-            model.setDistrictId(editParam.getDistrictId());
-            model.setAddress(editParam.getAddress());
-            model.setFullAddress(editParam.getFullAddress());
-            model.setPhone(editParam.getPhone());
-            model.setBusinessHours(editParam.getBusinessHours());
-            model.setExpireTime(editParam.getExpireTime());
-            model.setFrontEndName(editParam.getFrontEndName());
-            model.setFrontEndLogo(editParam.getFrontEndLogo());
-            model.setFrontEndIcon(editParam.getFrontEndIcon());
+            model.latitude = editParam.latitude;
+            model.longitude = editParam.longitude;
+            model.provinceId = editParam.provinceId;
+            model.cityId = editParam.cityId;
+            model.districtId = editParam.districtId;
+            model.address = editParam.address;
+            model.fullAddress = editParam.fullAddress;
+            model.phone = editParam.phone;
+            model.businessHours = editParam.businessHours;
+            model.expireTime = editParam.expireTime;
+            model.frontEndName = editParam.frontEndName;
+            model.frontEndLogo = editParam.frontEndLogo;
+            model.frontEndIcon = editParam.frontEndIcon;
             model.icon = editParam.icon;
-            model.setMemberNo(editParam.getMemberNo());
-            model.setApp(editParam.getApp());
-            model.setAddons(editParam.getAddons());
-            model.setInitalledAddon(editParam.getInitalledAddon());
-            model.setSiteDomain(editParam.getSiteDomain());
+            model.memberNo = editParam.memberNo;
+            model.app = editParam.app;
+            model.addons = editParam.addons;
+            model.initalledAddon = editParam.initalledAddon;
+            model.siteDomain = editParam.siteDomain;
             siteMapper.updateById(model);
   }
 
@@ -218,7 +218,7 @@ export class AuthSiteServiceImplService {
   async closeSite(siteId: number): Promise<any> {
     const model: Site = new Site();
             model.siteId = siteId;
-            model.status = SiteStatusEnum.CLOSE.getCode();
+            model.status = SiteStatusEnum.CLOSE.code;
             siteMapper.updateById(model);
   }
 
@@ -228,7 +228,7 @@ export class AuthSiteServiceImplService {
   async openSite(siteId: number): Promise<any> {
     const model: Site = new Site();
             model.siteId = siteId;
-            model.status = SiteStatusEnum.ON.getCode();
+            model.status = SiteStatusEnum.ON.code;
             siteMapper.updateById(model);
   }
 
@@ -258,13 +258,13 @@ export class AuthSiteServiceImplService {
                 queryWrapper.eq("status", siteSearchParam.status);
             }
     
-            if (CommonUtils.isNotEmpty(siteSearchParam.getGroupId())) {
-                queryWrapper.eq("group_id", siteSearchParam.getGroupId());
+            if (CommonUtils.isNotEmpty(siteSearchParam.groupId)) {
+                queryWrapper.eq("group_id", siteSearchParam.groupId);
             }
     
-            if (CommonUtils.isNotEmpty(siteSearchParam.getExpireTime())) {
+            if (CommonUtils.isNotEmpty(siteSearchParam.expireTime)) {
     
-                const expireTime: string[] = siteSearchParam.getExpireTime();
+                const expireTime: string[] = siteSearchParam.expireTime;
                 const startTime: number = (expireTime[0] == null) ? 0: DateUtils.StringToTimestamp(expireTime[0]);
                 const endTime: number = (expireTime[1] == null) ? 0: DateUtils.StringToTimestamp(expireTime[1]);
                 if(startTime > 0 && endTime > 0)
@@ -305,12 +305,12 @@ export class AuthSiteServiceImplService {
                 const siteGroupList: SiteGroup[] = this.siteGroupRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
                 for (const siteGroup of siteGroupList) {
                     const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo();
-                    userCreateSiteVo.setGroupId(siteGroup.getGroupId());
+                    userCreateSiteVo.groupId = siteGroup.groupId;
                     const siteGroupVo: SiteGroupVo = new SiteGroupVo();
                     BeanUtil.copyProperties(siteGroup, siteGroupVo);
-                    siteGroupVo.setAppName(this.addonService.getTitleListByKey(siteGroup.getApp()));
-                    siteGroupVo.setAddonName(this.addonService.getTitleListByKey(siteGroup.getAddon()));
-                    userCreateSiteVo.setSiteGroup(siteGroupVo);
+                    siteGroupVo.appName = this.addonService.getTitleListByKey(siteGroup.app);
+                    siteGroupVo.addonName = this.addonService.getTitleListByKey(siteGroup.addon);
+                    userCreateSiteVo.siteGroup = siteGroupVo;
                     userCreateSiteVoList.push(userCreateSiteVo);
                 }
             }else{
@@ -320,12 +320,12 @@ export class AuthSiteServiceImplService {
                 for (const userCreateSiteLimit of userCreateSiteLimitList) {
                     const userCreateSiteVo: UserCreateSiteVo = new UserCreateSiteVo();
                     BeanUtil.copyProperties(userCreateSiteLimit, userCreateSiteVo);
-                    const siteGroup: SiteGroup = siteGroupMapper.selectById(userCreateSiteLimit.getGroupId());
+                    const siteGroup: SiteGroup = siteGroupMapper.selectById(userCreateSiteLimit.groupId);
                     const siteGroupVo: SiteGroupVo = new SiteGroupVo();
                     BeanUtil.copyProperties(siteGroup, siteGroupVo);
-                    siteGroupVo.setAppName(this.addonService.getTitleListByKey(siteGroup.getApp()));
-                    siteGroupVo.setAddonName(this.addonService.getTitleListByKey(siteGroup.getAddon()));
-                    userCreateSiteVo.setSiteGroup(siteGroupVo);
+                    siteGroupVo.appName = this.addonService.getTitleListByKey(siteGroup.app);
+                    siteGroupVo.addonName = this.addonService.getTitleListByKey(siteGroup.addon);
+                    userCreateSiteVo.siteGroup = siteGroupVo;
                     userCreateSiteVoList.push(userCreateSiteVo);
                 }
             }
@@ -338,19 +338,19 @@ export class AuthSiteServiceImplService {
   async createSite(homeSiteAddParam: HomeSiteAddParam): Promise<any> {
     const month: number = 1;
             if(!this.authService.isSuperAdmin()){
-                const userCreateSiteLimit: UserCreateSiteLimit = this.userCreateSiteLimitRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", homeSiteAddParam.getGroupId()));
+                const userCreateSiteLimit: UserCreateSiteLimit = this.userCreateSiteLimitRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", homeSiteAddParam.groupId));
                 if (!userCreateSiteLimit) throw new BadRequestException("NO_PERMISSION_TO_CREATE_SITE_GROUP");
-                const userSiteNum: number = this.siteGroupService.getUserSiteGroupSiteNum(RequestUtils.uid(), homeSiteAddParam.getGroupId());
-                if(userSiteNum>userCreateSiteLimit.getNum()-1){
+                const userSiteNum: number = this.siteGroupService.getUserSiteGroupSiteNum(RequestUtils.uid(), homeSiteAddParam.groupId);
+                if(userSiteNum>userCreateSiteLimit.num-1){
                     throw new BadRequestException("SITE_GROUP_CREATE_SITE_EXCEEDS_LIMIT");
                 }
-                month=userCreateSiteLimit.getMonth();
+                month=userCreateSiteLimit.month;
             }
             const siteAddParam: SiteAddParam = new SiteAddParam();
-            siteAddParam.setSiteName(homeSiteAddParam.getSiteName());
-            siteAddParam.setUid(RequestUtils.uid());
-            siteAddParam.setGroupId(homeSiteAddParam.getGroupId());
-            siteAddParam.setExpireTime(DateUtils.getDateAddMonth(month));
+            siteAddParam.siteName = homeSiteAddParam.siteName;
+            siteAddParam.uid = RequestUtils.uid();
+            siteAddParam.groupId = homeSiteAddParam.groupId;
+            siteAddParam.expireTime = DateUtils.getDateAddMonth(month);
             this.siteService.push(siteAddParam);
   }
 
@@ -363,8 +363,8 @@ export class AuthSiteServiceImplService {
                 return List.of();
             }
             const addonList: Addon[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
-                    .eq(Addon::getStatus, AddonStatusEnum.ON.getCode())
-                    .eq(Addon::getType, AddonActionEnum.APP.getCode())
+                    .eq(Addon::getStatus, AddonStatusEnum.ON.code)
+                    .eq(Addon::getType, AddonActionEnum.APP.code)
                     .in(Addon::getKey, siteGroupAppList));
     
             return processAddonList(addonList);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-account-service-impl.service.ts

@@ -24,18 +24,18 @@ export class MemberAccountServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("mal").innerJoin("?_member m ON mal.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "mal".innerJoin("?_member m ON mal.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("mal.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("mal.site_id", siteId);
-            queryWrapper.eq("mal.account_type", searchParam.getAccountType());
+            queryWrapper.eq("mal.account_type", searchParam.accountType);
             queryWrapper.orderByDesc("mal.id");
     
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords()))
-                queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.getKeywords());
+            if (CommonUtils.isNotEmpty(searchParam.keywords))
+                queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.keywords);
             if (ObjectUtil.defaultIfNull(searchParam.memberId, 0) > 0)
                 queryWrapper.eq("mal.member_id", searchParam.memberId);
-            if (CommonUtils.isNotEmpty(searchParam.getFromType()))
-                queryWrapper.eq("mal.from_type", searchParam.getFromType());
+            if (CommonUtils.isNotEmpty(searchParam.fromType))
+                queryWrapper.eq("mal.from_type", searchParam.fromType);
             if (CommonUtils.isNotEmpty(searchParam.createTime))
                 QueryMapperUtils.buildByTime(queryWrapper, "mal.create_time", searchParam.createTime);
     
@@ -48,7 +48,7 @@ export class MemberAccountServiceImplService {
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
     
-                vo.setMember(memberInfoVo);
+                vo.member = memberInfoVo;
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -80,27 +80,27 @@ export class MemberAccountServiceImplService {
     
             if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) {
                 const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId);
-                vo.setCommission(memberAccountInfo.getCommission());
-                vo.setCommissionCashOuting(memberAccountInfo.getCommissionCashOuting());
-                vo.setTotalCommission(memberAccountInfo.getCommissionGet());
+                vo.commission = memberAccountInfo.commission;
+                vo.commissionCashOuting = memberAccountInfo.commissionCashOuting;
+                vo.totalCommission = memberAccountInfo.commissionGet;
                 const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
                         .eq("member_id", searchParam.memberId)
                         .eq("site_id", siteId)
                         .eq("account_type", AccountTypeEnum.COMMISSION.type)
                         .eq("from_type", "cash_out"));
-                vo.setWithdrawnCommission(memberAccountLog == null ? zero : memberAccountLog.getAccountSum());
+                vo.withdrawnCommission = memberAccountLog == null ? zero : memberAccountLog.accountSum;
             } else {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS commission_get,SUM(commission) AS commission, SUM(commission_cash_outing) AS commission_cash_outing")
                         .eq("site_id", siteId));
     
-                vo.setCommission(member == null ? zero : member.getCommission());
-                vo.setCommissionCashOuting(member == null ? zero : member.getCommissionCashOuting());
-                vo.setTotalCommission(member == null ? zero : member.getCommissionGet());
+                vo.commission = member == null ? zero : member.commission;
+                vo.commissionCashOuting = member == null ? zero : member.commissionCashOuting;
+                vo.totalCommission = member == null ? zero : member.commissionGet;
                 const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
                         .eq("site_id", siteId)
                         .eq("account_type", AccountTypeEnum.COMMISSION.type)
                         .eq("from_type", "cash_out"));
-                vo.setWithdrawnCommission(memberAccountLog == null ? zero : memberAccountLog.getAccountSum());
+                vo.withdrawnCommission = memberAccountLog == null ? zero : memberAccountLog.accountSum;
             }
             return vo;
   }
@@ -115,14 +115,14 @@ export class MemberAccountServiceImplService {
             if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) {
                 const memberAccountInfo: MemberAccountVo = this.getMemberAccountInfo(searchParam.memberId);
     
-                vo.setBalance(memberAccountInfo == null ? new BigDecimal(0) : memberAccountInfo.getBalance());
-                vo.setMoney(memberAccountInfo == null ? new BigDecimal(0) : memberAccountInfo.getMoney());
+                vo.balance = memberAccountInfo == null ? new BigDecimal(0 : memberAccountInfo.balance);
+                vo.money = memberAccountInfo == null ? new BigDecimal(0 : memberAccountInfo.money);
             } else {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS balance,SUM(money) AS money")
                         .eq("site_id", siteId));
     
-                vo.setBalance(member == null ? new BigDecimal(0) : member.getBalance());
-                vo.setMoney(member == null ? new BigDecimal(0) : member.getMoney());
+                vo.balance = member == null ? new BigDecimal(0 : member.balance);
+                vo.money = member == null ? new BigDecimal(0 : member.money);
             }
     
             return vo;
@@ -142,18 +142,18 @@ export class MemberAccountServiceImplService {
                         .eq("member_id", searchParam.memberId)
                         .eq("account_type", AccountTypeEnum.POINT.type)
                         .lt("account_data", 0));
-                vo.setPointGet(memberAccountInfo.getPointGet());
-                vo.setPointUse(memberAccountLog == null ? 0 : memberAccountLog.getAccountSum().abs().intValue());
+                vo.pointGet = memberAccountInfo.pointGet;
+                vo.pointUse = memberAccountLog == null ? 0 : memberAccountLog.accountSum.abs(.intValue());
             } else {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS point_get")
                         .eq("site_id", siteId));
-                vo.setPointGet(member == null ? 0 : member.getPointGet());
+                vo.pointGet = member == null ? 0 : member.pointGet;
     
                 const memberAccountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }) AS account_sum")
                         .eq("site_id", siteId)
                         .eq("account_type", AccountTypeEnum.POINT.type)
                         .lt("account_data", 0));
-                vo.setPointUse(memberAccountLog == null ? 0 : memberAccountLog.getAccountSum().abs().intValue());
+                vo.pointUse = memberAccountLog == null ? 0 : memberAccountLog.accountSum.abs(.intValue());
             }
     
             return vo;
@@ -163,13 +163,13 @@ export class MemberAccountServiceImplService {
    * adjustPoint
    */
   async adjustPoint(param: AdjustAccountParam): Promise<any> {
-    this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.POINT.type, param.getAccountData(), "adjust", param.getMemo(), "");
+    this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.POINT.type, param.accountData, "adjust", param.memo, "");
   }
 
   /**
    * adjustBalance
    */
   async adjustBalance(param: AdjustAccountParam): Promise<any> {
-    this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.BALANCE.type, param.getAccountData(), "adjust", param.getMemo(), "");
+    this.coreMemberAccountService.addLog(this.requestContext.siteId, param.memberId, AccountTypeEnum.BALANCE.type, param.accountData, "adjust", param.memo, "");
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-cash-out-service-impl.service.ts

@@ -25,30 +25,30 @@ export class MemberCashOutServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<MemberCashOut> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("mco").innerJoin("?_member m ON mco.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "mco".innerJoin("?_member m ON mco.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("mco.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("mco.site_id", siteId);
             queryWrapper.orderByDesc("mco.id");
     
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords())) {
-                queryWrapper.and(i => i.like("m.member_no", searchParam.getKeywords())
-                                .or().like("m.username", searchParam.getKeywords())
-                                .or().like("m.nickname", searchParam.getKeywords())
-                                .or().like("m.mobile", searchParam.getKeywords())
+            if (CommonUtils.isNotEmpty(searchParam.keywords)) {
+                queryWrapper.and(i => i.like("m.member_no", searchParam.keywords)
+                                .or().like("m.username", searchParam.keywords)
+                                .or().like("m.nickname", searchParam.keywords)
+                                .or().like("m.mobile", searchParam.keywords)
                 );
             }
             if (CommonUtils.isNotEmpty(searchParam.memberId) && searchParam.memberId > 0) queryWrapper.eq("mco.member_id", searchParam.memberId);
             if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("mco.status", searchParam.status);
-            if (CommonUtils.isNotEmpty(searchParam.getCashOutNo())) queryWrapper.like("mco.cash_out_no", searchParam.getCashOutNo());
-            if (CommonUtils.isNotEmpty(searchParam.getTransferType())) queryWrapper.like("mco.transfer_type", searchParam.getTransferType());
+            if (CommonUtils.isNotEmpty(searchParam.cashOutNo)) queryWrapper.like("mco.cash_out_no", searchParam.cashOutNo);
+            if (CommonUtils.isNotEmpty(searchParam.transferType)) queryWrapper.like("mco.transfer_type", searchParam.transferType);
             if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "mco.create_time", searchParam.createTime);
-            if (CommonUtils.isNotEmpty(searchParam.getTransferTime())) QueryMapperUtils.buildByTime(queryWrapper, "mco.transfer_time", searchParam.getTransferTime());
+            if (CommonUtils.isNotEmpty(searchParam.transferTime)) QueryMapperUtils.buildByTime(queryWrapper, "mco.transfer_time", searchParam.transferTime);
     
             [MemberCashOutListVo[], number] iPage = memberCashOutMapper.selectJoinPage(new Page<>(page, limit), MemberCashOutListVo.class, queryWrapper);
             for (const item of iPageRecords) {
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
-                item.setMember(memberInfoVo);
+                item.member = memberInfoVo;
             }
             return PageResult.build(page, limit, iPageTotal).setData(iPageRecords);
   }
@@ -72,10 +72,10 @@ export class MemberCashOutServiceImplService {
     
             if (vo != null) {
                 MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer();
-                transfer.setTransferNo(vo.getTransferNo());
-                transfer.setTransferRemark(vo.getTransferRemark());
-                transfer.setTransferVoucher(vo.getTransferVoucher());
-                vo.setTransfer(transfer);
+                transfer.transferNo = vo.transferNo;
+                transfer.transferRemark = vo.transferRemark;
+                transfer.transferVoucher = vo.transferVoucher;
+                vo.transfer = transfer;
             }
     
             return vo;
@@ -99,11 +99,11 @@ export class MemberCashOutServiceImplService {
                             .last("limit 1"));
     
             const zero: BigDecimal = new BigDecimal(0);
-            vo.setTransfered(transfered == null ? zero : transfered.getApplyMoney());
+            vo.transfered = transfered == null ? zero : transfered.applyMoney;
             if (allMoney != null) {
-                vo.setCashOuting(allMoney.getApplyMoney().subtract(vo.getTransfered()));
+                vo.cashOuting = allMoney.applyMoney.subtract(vo.transfered);
             } else {
-                vo.setCashOuting(zero);
+                vo.cashOuting = zero;
             }
             return vo;
   }
@@ -146,7 +146,7 @@ export class MemberCashOutServiceImplService {
             );
             if (!model) throw new BadRequestException("数据不存在");
     
-            model.setRemark(param.getRemark());
+            model.remark = param.remark;
             memberCashOutMapper.updateById(model);
   }
 

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-config-service-impl.service.ts

@@ -25,7 +25,7 @@ export class MemberConfigServiceImplService {
    * setLoginConfig
    */
   async setLoginConfig(configParam: LoginConfigParam): Promise<any> {
-    this.this.CoreMemberConfigService.setLoginConfig(this.requestContext.siteId, configParam);
+    this.this.CoreMemberConfigService.loginConfig = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -39,7 +39,7 @@ export class MemberConfigServiceImplService {
    * setCashOutConfig
    */
   async setCashOutConfig(configParam: CashOutConfigParam): Promise<any> {
-    this.this.CoreMemberConfigService.setCashOutConfig(this.requestContext.siteId, configParam);
+    this.this.CoreMemberConfigService.cashOutConfig = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -53,7 +53,7 @@ export class MemberConfigServiceImplService {
    * setMemberConfig
    */
   async setMemberConfig(configParam: MemberConfigParam): Promise<any> {
-    this.this.CoreMemberConfigService.setMemberConfig(this.requestContext.siteId, configParam);
+    this.this.CoreMemberConfigService.memberConfig = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -67,7 +67,7 @@ export class MemberConfigServiceImplService {
    * setGrowthRuleConfig
    */
   async setGrowthRuleConfig(configParam: JSONObject): Promise<any> {
-    this.this.CoreMemberConfigService.setGrowthRuleConfig(this.requestContext.siteId, configParam);
+    this.this.CoreMemberConfigService.growthRuleConfig = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -81,6 +81,6 @@ export class MemberConfigServiceImplService {
    * setPointRuleConfig
    */
   async setPointRuleConfig(configParam: JSONObject): Promise<any> {
-    this.this.CoreMemberConfigService.setPointRuleConfig(this.requestContext.siteId, configParam);
+    this.this.CoreMemberConfigService.pointRuleConfig = this.requestContext.siteId, configParam;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-label-service-impl.service.ts

@@ -25,14 +25,14 @@ export class MemberLabelServiceImplService {
             any /* TODO: QueryWrapper<MemberLabel> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", siteId);
             queryWrapper.orderByDesc("label_id");
-            if (CommonUtils.isNotEmpty(searchParam.getLabelName())){
-                queryWrapper.like("label_name", searchParam.getLabelName());
+            if (CommonUtils.isNotEmpty(searchParam.labelName)){
+                queryWrapper.like("label_name", searchParam.labelName);
             }
             [MemberLabel[], number] iPage = this.memberLabelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: MemberLabelListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: MemberLabelListVo = new MemberLabelListVo();
-                const labelId: number = item.getLabelId();
+                const labelId: number = item.labelId;
                 any /* TODO: QueryWrapper<Member> */ wrapper = new QueryWrapper();
                 wrapper.eq("site_id",siteId);
                 const canshu: string = String(labelId);
@@ -40,7 +40,7 @@ export class MemberLabelServiceImplService {
                 wrapper.apply("JSON_VALID(member_label) = 1 AND JSON_SEARCH(member_label, 'one', {0}) IS NOT NULL",canshu);
                 const members: Member[] = this.memberRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
                 Object.assign(vo, item);
-                vo.setMemberNum(members.length);
+                vo.memberNum = members.length;
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -71,9 +71,9 @@ export class MemberLabelServiceImplService {
     
             const model: MemberLabel = new MemberLabel();
             model.siteId = siteId;
-            model.setLabelName(addParam.getLabelName());
-            model.setMemo(addParam.getMemo());
-            model.setSort(addParam.getSort());
+            model.labelName = addParam.labelName;
+            model.memo = addParam.memo;
+            model.sort = addParam.sort;
             model.createTime = Date.now( / 1000);
     
             this.memberLabelRepository.save(model);
@@ -90,9 +90,9 @@ export class MemberLabelServiceImplService {
                     .eq("label_id",  id);
     
             const model: MemberLabel = new MemberLabel();
-            model.setLabelName(editParam.getLabelName());
-            model.setMemo(editParam.getMemo());
-            model.setSort(editParam.getSort());
+            model.labelName = editParam.labelName;
+            model.memo = editParam.memo;
+            model.sort = editParam.sort;
             model.updateTime = Date.now( / 1000);
     
             this.memberLabelRepository.save(model, updateWrapper);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-level-service-impl.service.ts

@@ -24,16 +24,16 @@ export class MemberLevelServiceImplService {
             any /* TODO: QueryWrapper<MemberLevel> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", siteId);
             queryWrapper.orderByAsc("growth");
-            if (CommonUtils.isNotEmpty(searchParam.getLevelName())) queryWrapper.like("level_name", searchParam.getLevelName());
+            if (CommonUtils.isNotEmpty(searchParam.levelName)) queryWrapper.like("level_name", searchParam.levelName);
     
             [MemberLevel[], number] iPage = this.memberLevelRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: MemberLevelListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: MemberLevelListVo = new MemberLevelListVo();
                 Object.assign(vo, item);
-                vo.setMemberNum(this.memberRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ }))));
-                if (CommonUtils.isNotEmpty(item.getLevelBenefits())) vo.setLevelBenefits(this.coreMemberService.getBenefitsContent(item.siteId, JsonUtils.parseObject<any>(item.getLevelBenefits()), "admin"));
-                if (CommonUtils.isNotEmpty(item.getLevelGifts())) vo.setLevelGifts(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getLevelGifts()), "admin"));
+                vo.memberNum = this.memberRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })));
+                if (CommonUtils.isNotEmpty(item.levelBenefits)) vo.levelBenefits = this.coreMemberService.getBenefitsContent(item.siteId, JsonUtils.parseObject<any>(item.levelBenefits, "admin"));
+                if (CommonUtils.isNotEmpty(item.levelGifts)) vo.levelGifts = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.levelGifts, "admin"));
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -65,12 +65,12 @@ export class MemberLevelServiceImplService {
             const model: MemberLevel = new MemberLevel();
     
             model.siteId = siteId;
-            model.setLevelName(addParam.getLevelName());
-            model.setGrowth(addParam.getGrowth());
-            model.setRemark(addParam.getRemark());
+            model.levelName = addParam.levelName;
+            model.growth = addParam.growth;
+            model.remark = addParam.remark;
             model.createTime = Date.now( / 1000);
-            model.setLevelBenefits(addParam.getLevelBenefits().toString());
-            model.setLevelGifts(addParam.getLevelGifts().toString());
+            model.levelBenefits = addParam.levelBenefits.toString();
+            model.levelGifts = addParam.levelGifts.toString();
     
             this.memberLevelRepository.save(model);
   }
@@ -86,12 +86,12 @@ export class MemberLevelServiceImplService {
                     .eq("level_id",  id);
     
             const model: MemberLevel = new MemberLevel();
-            model.setLevelName(editParam.getLevelName());
-            model.setGrowth(editParam.getGrowth());
-            model.setRemark(editParam.getRemark());
+            model.levelName = editParam.levelName;
+            model.growth = editParam.growth;
+            model.remark = editParam.remark;
             model.updateTime = Date.now( / 1000);
-            model.setLevelBenefits(editParam.getLevelBenefits().toString());
-            model.setLevelGifts(editParam.getLevelGifts().toString());
+            model.levelBenefits = editParam.levelBenefits.toString();
+            model.levelGifts = editParam.levelGifts.toString();
     
             this.memberLevelRepository.save(model, updateWrapper);
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-service-impl.service.ts

@@ -27,7 +27,7 @@ export class MemberServiceImplService {
     
             const siteId: number = this.requestContext.siteId;
             MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("m").leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "m".leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("m.*, ml.level_name as member_level_name");
             queryWrapper.eq("m.site_id", siteId);
             queryWrapper.orderByDesc("member_id");
@@ -40,20 +40,20 @@ export class MemberServiceImplService {
                         .like("mobile", searchParam.keyword));
             }
     
-            if (ObjectUtil.isNotNull(searchParam.getIsDel()) && CommonUtils.isNotEmpty(searchParam.keyword)) {
-                queryWrapper.eq("is_del", searchParam.getIsDel());
+            if (ObjectUtil.isNotNull(searchParam.isDel) && CommonUtils.isNotEmpty(searchParam.keyword)) {
+                queryWrapper.eq("is_del", searchParam.isDel);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getMemberLevel()) && searchParam.getMemberLevel() != 0) {
-                queryWrapper.eq("member_level", searchParam.getMemberLevel());
+            if (CommonUtils.isNotEmpty(searchParam.memberLevel) && searchParam.memberLevel != 0) {
+                queryWrapper.eq("member_level", searchParam.memberLevel);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getRegisterChannel())) {
-                queryWrapper.eq("register_channel", searchParam.getRegisterChannel());
+            if (CommonUtils.isNotEmpty(searchParam.registerChannel)) {
+                queryWrapper.eq("register_channel", searchParam.registerChannel);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getMemberLabel()) && searchParam.getMemberLabel() != 0) {
-                queryWrapper.like("member_label", searchParam.getMemberLabel());
+            if (CommonUtils.isNotEmpty(searchParam.memberLabel) && searchParam.memberLabel != 0) {
+                queryWrapper.like("member_label", searchParam.memberLabel);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getRegisterType())) {
-                queryWrapper.eq("register_type", searchParam.getRegisterType());
+            if (CommonUtils.isNotEmpty(searchParam.registerType)) {
+                queryWrapper.eq("register_type", searchParam.registerType);
             }
             if (CommonUtils.isNotEmpty(searchParam.createTime)) {
                 QueryMapperUtils.buildByTime(queryWrapper, "m.create_time", searchParam.createTime);
@@ -78,13 +78,13 @@ export class MemberServiceImplService {
             for (const item of memberList) {
                 const vo: MemberListVo = new MemberListVo();
                 Object.assign(vo, item);
-                vo.setSexName(SexEnum.getNameBySex(item.getSex()));
-                vo.setStatusName(StatusEnum.getNameByStatus(item.status));
-                vo.setRegisterChannelName(ChannelEnum.getNameByCode(item.getRegisterChannel()));
-                vo.setMemberLevelName(levelMap.getOrDefault(item.getMemberLevel(), new MemberLevel()).getLevelName());
+                vo.sexName = SexEnum.getNameBySex(item.sex);
+                vo.statusName = StatusEnum.getNameByStatus(item.status);
+                vo.registerChannelName = ChannelEnum.getNameByCode(item.registerChannel);
+                vo.memberLevelName = levelMap.getOrDefault(item.memberLevel, new MemberLevel().getLevelName());
     
-                if (!item.getMemberLabel().isEmpty()) {
-                    const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel());
+                if (!item.memberLabel.isEmpty()) {
+                    const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.memberLabel);
                     if (memberLabelArrays != null && memberLabelArrays.length > 0) {
                         const memberLabelArray: MemberLabelAllListVo[] = [];
                         const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays));
@@ -93,7 +93,7 @@ export class MemberServiceImplService {
                             Object.assign(labelVo, labelItem);
                             memberLabelArray.push(labelVo);
                         }
-                        vo.setMemberLabelArray(memberLabelArray);
+                        vo.memberLabelArray = memberLabelArray;
                     }
                 }
                 list.push(vo);
@@ -119,12 +119,12 @@ export class MemberServiceImplService {
     
             const vo: MemberInfoVo = new MemberInfoVo();
             Object.assign(vo, model);
-            if ("0".equals(model.getMemberLevel())){
-                vo.setMemberLevel("");
+            if ("0".equals(model.memberLevel)){
+                vo.memberLevel = "";
             }
     
-            if (StrUtil.isNotEmpty(model.getMemberLabel()) && ![model.getMemberLabel(]).isEmpty()) {
-                const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.getMemberLabel());
+            if (StrUtil.isNotEmpty(model.memberLabel) && ![model.getMemberLabel(]).isEmpty()) {
+                const memberLabelArrays: JSONArray = JSONUtil.parseArray(vo.memberLabel);
                 if (memberLabelArrays != null && memberLabelArrays.length > 0) {
                     const memberLabelArray: MemberLabelAllListVo[] = [];
                     const labelList: MemberLabel[] = this.memberLabelRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).in("label_id", memberLabelArrays));
@@ -133,7 +133,7 @@ export class MemberServiceImplService {
                         Object.assign(labelVo, item);
                         memberLabelArray.push(labelVo);
                     }
-                    vo.setMemberLabelArray(memberLabelArray);
+                    vo.memberLabelArray = memberLabelArray;
                 }
             }
             return vo;
@@ -145,47 +145,47 @@ export class MemberServiceImplService {
   async add(addParam: MemberAddParam): Promise<any> {
     const siteId: number = this.requestContext.siteId;
     
-            addParam.setUsername(addParam.getMobile());
+            addParam.username = addParam.mobile;
     
             const mobileIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
                     .eq("site_id", siteId)
-                    .and(i => i.eq("mobile", addParam.getMobile()).or().eq("username", addParam.getMobile()))
+                    .and(i => i.eq("mobile", addParam.mobile).or().eq("username", addParam.mobile))
                     .last("limit 1"));
             Assert.isNull(mobileIsExist, "手机号已存在");
     
-            if (addParam.getNickname().length() == 0 & addParam.getMobile().length() > 0) {
-                addParam.setNickname(addParam.getMobile().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+            if (addParam.nickname.length() == 0 & addParam.mobile.length() > 0) {
+                addParam.nickname = addParam.mobile.replaceAll("(\\d{3}\\d{4}(\\d{4})", "$1****$2"));
             }
     
-            if (addParam.getMemberNo().isEmpty()) {
-                addParam.setMemberNo(this.this.CoreMemberService.createMemberNo(siteId));
+            if (addParam.memberNo.isEmpty()) {
+                addParam.memberNo = this.this.CoreMemberService.createMemberNo(siteId);
             } else {
                 const memberNoIsExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
                         .eq("site_id", siteId)
-                        .eq("member_no", addParam.getMemberNo())
+                        .eq("member_no", addParam.memberNo)
                         .last("limit 1"));
                 Assert.isNull(memberNoIsExist, "会员编码已存在");
             }
     
             const model: Member = new Member();
             model.siteId = siteId;
-            model.setMobile(addParam.getMobile());
-            model.setMemberNo(addParam.getMemberNo());
-            model.setUsername(addParam.getUsername());
-            model.setNickname(addParam.getNickname());
-            model.setHeadimg(addParam.getHeadimg());
-            model.setPassword(PasswordEncipher.encode(addParam.getPassword()));
-            model.setRegisterType(MemberRegisterTypeEnum.MANUAL.type);
-            model.setRegisterChannel(MemberRegisterChannelEnum.MANUAL.type);
+            model.mobile = addParam.mobile;
+            model.memberNo = addParam.memberNo;
+            model.username = addParam.username;
+            model.nickname = addParam.nickname;
+            model.headimg = addParam.headimg;
+            model.password = PasswordEncipher.encode(addParam.password);
+            model.registerType = MemberRegisterTypeEnum.MANUAL.type;
+            model.registerChannel = MemberRegisterChannelEnum.MANUAL.type;
             model.createTime = Date.now( / 1000);
-            model.setMemberLabel("[]");
+            model.memberLabel = "[]";
             this.memberRepository.save(model);
             // 会员注册事件
             const registerEvent: MemberRegisterEvent = new MemberRegisterEvent();
             registerEvent.siteId = this.requestContext.siteId;
             registerEvent.addAppSign("shop_fenxiao");
             registerEvent.name = "MemberRegisterEvent";
-            registerEvent.setMember(model);
+            registerEvent.member = model;
             EventPublisher.publishEvent(registerEvent);
   }
 
@@ -200,11 +200,11 @@ export class MemberServiceImplService {
                     .eq("member_id", id);
     
             const model: Member = new Member();
-            model.setNickname(editParam.getNickname());
-            model.setHeadimg(editParam.getHeadimg());
-            model.setPassword(editParam.getPassword());
-            model.setSex(editParam.getSex());
-            model.setBirthday(editParam.getBirthday());
+            model.nickname = editParam.nickname;
+            model.headimg = editParam.headimg;
+            model.password = editParam.password;
+            model.sex = editParam.sex;
+            model.birthday = editParam.birthday;
     
             this.memberRepository.save(model, updateWrapper);
   }
@@ -213,8 +213,8 @@ export class MemberServiceImplService {
    * modify
    */
   async modify(editParam: MemberModifyParam): Promise<any> {
-    if (editParam == null || editParam.getField() == null || editParam.value == null) {
-                if(editParam.getField() === "member_label"){
+    if (editParam == null || editParam.field == null || editParam.value == null) {
+                if(editParam.field === "member_label"){
                     throw new AdminException("修改参数不能为空");
                 }
             }
@@ -226,7 +226,7 @@ export class MemberServiceImplService {
             updateWrapper.eq(Member::getSiteId, siteId)
                     .eq(Member::getMemberId, editParam.memberId);
     
-            switch (editParam.getField()) {
+            switch (editParam.field) {
                 case "nickname":
                     updateWrapper.set(Member::getNickname, value === "" || value === "null" ? "" : value);
                     break;
@@ -308,7 +308,7 @@ export class MemberServiceImplService {
     const siteId: number = this.requestContext.siteId;
     
             UpdateWrapper<Member> updateWrapper = new UpdateWrapper();
-            updateWrapper.in("member_id", param.getMemberIds());
+            updateWrapper.in("member_id", param.memberIds);
             updateWrapper.eq("site_id", siteId);
     
             const updateMember: Member = new Member();
@@ -344,9 +344,9 @@ export class MemberServiceImplService {
     if (CommonUtils.isEmpty(param.value.toString())){
                 return;
             }
-            const field: string = param.getField();
-            const memberIds: number[] = param.getMemberIds();
-            const isAll: number = param.getIsAll();
+            const field: string = param.field;
+            const memberIds: number[] = param.memberIds;
+            const isAll: number = param.isAll;
             if (!"member_label".equals(field) && !"member_level".equals(field)){
                 throw new BadRequestException("不支持的字段:" + field);
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/member/impl/member-sign-service-impl.service.ts

@@ -23,14 +23,14 @@ export class MemberSignServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<MemberSign> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("ms").innerJoin("?_member m ON ms.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "ms".innerJoin("?_member m ON ms.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("ms.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("ms.site_id", siteId);
             queryWrapper.orderByDesc("ms.sign_id");
     
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords())){
-    //            queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.getKeywords());
-                QueryMapperUtils.addMultiLike(queryWrapper, searchParam.getKeywords(),
+            if (CommonUtils.isNotEmpty(searchParam.keywords)){
+    //            queryWrapper.like("m.member_no|m.username|m.nickname|m.mobile", searchParam.keywords);
+                QueryMapperUtils.addMultiLike(queryWrapper, searchParam.keywords,
                         "m.member_no", "m.username", "m.nickname", "m.mobile");
             }
             if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -43,16 +43,16 @@ export class MemberSignServiceImplService {
                 const vo: MemberSignListVo = new MemberSignListVo();
                 Object.assign(vo, item);
     
-                if (!item.getDayAward().isEmpty()) {
-                    vo.setDayAward(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getDayAward()), "admin"));
+                if (!item.dayAward.isEmpty()) {
+                    vo.dayAward = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.dayAward, "admin"));
                 }
-                if (!item.getContinueAward().isEmpty()) {
-                    vo.setContinueAward(this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.getContinueAward()), "admin"));
+                if (!item.continueAward.isEmpty()) {
+                    vo.continueAward = this.coreMemberService.getGiftContent(item.siteId, JsonUtils.parseObject<any>(item.continueAward, "admin"));
                 }
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
     
-                vo.setMember(memberInfoVo);
+                vo.member = memberInfoVo;
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -70,6 +70,6 @@ export class MemberSignServiceImplService {
    * setSignConfig
    */
   async setSignConfig(configParam: SignConfigParam): Promise<any> {
-    this.this.CoreConfigService.setConfig(this.requestContext.siteId, "SIGN_CONFIG", JsonUtils.parseObject<any>(configParam));
+    this.this.CoreConfigService.config = this.requestContext.siteId, "SIGN_CONFIG", JsonUtils.parseObject<any>(configParam);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/cloud-build-service-impl.service.ts

@@ -56,14 +56,14 @@ export class CloudBuildServiceImplService {
     
             const zipFile: string = ZipUtil.zip(packageDir, tempDir + "build.zip");
     
-            const instance: NiucloudUtils = NiucloudUtils.getInstance();
+            const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const actionQuery: Record<String, Object> = new const query: Record<>();
-            actionQuery.put("data[product_key]", instance.getProductKey());
+            actionQuery.put("data[product_key]", instance.productKey);
             const actionToken: Record<string, any> = this.niucloudService.getActionToken("cloudbuild", actionQuery);
     
             Record<String, Object> = {};
-            query.put("authorize_code", instance.getCode());
+            query.put("authorize_code", instance.code);
             query.put("timestamp", Date.now() / 1000);
             query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
     
@@ -92,10 +92,10 @@ export class CloudBuildServiceImplService {
             if (this.buildTask == null) return null;
             if (!this.buildTask.getStr("mode").equals(mode)) return null;
     
-            const instance: NiucloudUtils = NiucloudUtils.getInstance();
+            const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("authorize_code", instance.getCode());
+            query.put("authorize_code", instance.code);
             query.put("timestamp", this.buildTask.getStr("timestamp"));
     
             const response: HttpResponse = new NiucloudUtils.Cloud().useThirdBuild().build("cloud/get_build_logs").query(query).method(Method.GET).execute();
@@ -118,7 +118,7 @@ export class CloudBuildServiceImplService {
    */
   async setLocalCloudCompileConfig(param: ConnectTestParam): Promise<any> {
     const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(JSONUtil.toJsonPrettyStr(param));
-            this.coreConfigService.setConfig(RequestUtils.defaultSiteId(), "LOCAL_CLOUD_COMPILE_CONFIG", jsonObject);
+            this.coreConfigService.config = RequestUtils.defaultSiteId(, "LOCAL_CLOUD_COMPILE_CONFIG", jsonObject);
   }
 
   /**

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/niucloud/impl/niu-cloud-service-impl.service.ts

@@ -17,17 +17,17 @@ export class NiuCloudServiceImplService {
    * getFrameworkLastVersion
    */
   async getFrameworkLastVersion(): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("product_key", instance.getProductKey());
+            query.put("product_key", instance.productKey);
     
             const data: Record<string, any> = NiucloudUtils.Niucloud.get("store/framework/lastversion", query).getRecord<string, any>("data");
     
             const frameWorkVersion: FrameWorkVersion = new FrameWorkVersion();
             if (data != null) {
-                frameWorkVersion.setLastVersion(data.getStr("last_version", ""));
-                frameWorkVersion.setLastUpdateTime(data.getStr("last_update_time", ""));
+                frameWorkVersion.lastVersion = data.getStr("last_version", "");
+                frameWorkVersion.lastUpdateTime = data.getStr("last_update_time", "");
             }
     
             return frameWorkVersion;
@@ -37,10 +37,10 @@ export class NiuCloudServiceImplService {
    * getFrameworkVersionList
    */
   async getFrameworkVersionList(): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("product_key", instance.getProductKey());
+            query.put("product_key", instance.productKey);
     
             const data: JSONArray = NiucloudUtils.Niucloud.get("store/framework/version", query).getJSONArray("data");
             if (data == null) return null;
@@ -56,12 +56,12 @@ export class NiuCloudServiceImplService {
    * getAuthinfo
    */
   async getAuthinfo(): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("code", instance.getCode());
-            query.put("secret", instance.getSecret());
-            query.put("product_key", instance.getProductKey());
+            query.put("code", instance.code);
+            query.put("secret", instance.secret);
+            query.put("product_key", instance.productKey);
     
             const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data");
             if (authInfo == null) return null;
@@ -76,17 +76,17 @@ export class NiuCloudServiceImplService {
    * setAuthorize
    */
   async setAuthorize(param: SetAuthorizeParam): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("code", param.getAuthCode());
-            query.put("secret", param.getAuthSecret());
-            query.put("product_key", instance.getProductKey());
+            query.put("code", param.authCode);
+            query.put("secret", param.authSecret);
+            query.put("product_key", instance.productKey);
     
             const authInfo: Record<string, any> = NiucloudUtils.Niucloud.get("authinfo", query).getRecord<string, any>("data");
             if (authInfo == null) throw new BadRequestException("未获取到授权信息");
     
-            this.coreNiucloudConfigService.setNiucloudConfig(param);
+            this.coreNiucloudConfigService.niucloudConfig = param;
             NiucloudUtils.Niucloud.clearAccessToken();
   }
 
@@ -94,12 +94,12 @@ export class NiuCloudServiceImplService {
    * getModuleList
    */
   async getModuleList(): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("code", instance.getCode());
-            query.put("secret", instance.getSecret());
-            query.put("product_key", instance.getProductKey());
+            query.put("code", instance.code);
+            query.put("secret", instance.secret);
+            query.put("product_key", instance.productKey);
     
             const addonList: JSONArray = NiucloudUtils.Niucloud.get("member_app_all", query).getJSONArray("data");
             if (addonList == null && addonList.length == 0) return null;
@@ -124,10 +124,10 @@ export class NiuCloudServiceImplService {
    * checkKey
    */
   async checkKey(key: string): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("product_key", instance.getProductKey());
+            query.put("product_key", instance.productKey);
     
             return NiucloudUtils.Niucloud.get("store/app_check/" + key, query).get("data", boolean.class);
   }
@@ -136,10 +136,10 @@ export class NiuCloudServiceImplService {
    * getAppVersionList
    */
   async getAppVersionList(param: GetAppVersionListParam): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("product_key", instance.getProductKey());
+            query.put("product_key", instance.productKey);
             query.put("app_key", param.appKey);
     
             const data: JSONArray = ObjectUtil.defaultIfNull(NiucloudUtils.Niucloud.get("store/app_version/list", query).get("data", JSONArray.class), new JSONArray());

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/notice/impl/nui-sms-service-impl.service.ts

@@ -45,9 +45,9 @@ export class NuiSmsServiceImplService {
    */
   async sendMobileCode(param: SendMobileCodeParam): Promise<any> {
     const body: Record<String, String> = {};
-            body.put("mobile", param.getMobile());
-            body.put("captcha_key", param.getCaptchaKey());
-            body.put("captcha_code", param.getCaptchaCode());
+            body.put("mobile", param.mobile);
+            body.put("captcha_key", param.captchaKey);
+            body.put("captcha_code", param.captchaCode);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(SEND_CODE_URL, body);
                 const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -64,8 +64,8 @@ export class NuiSmsServiceImplService {
    * registerAccount
    */
   async registerAccount(param: RegisterAccountParam): Promise<number> {
-    if (CommonUtils.isNotEmpty(param.getImgUrl())) {
-                param.setImgUrl(RequestUtils.getReqeustURI(, param.getImgUrl()).toString());
+    if (CommonUtils.isNotEmpty(param.imgUrl)) {
+                param.imgUrl = RequestUtils.getReqeustURI(, param.imgUrl.toString());
             }
             const result: Record<string, any> = null;
             try {
@@ -83,18 +83,18 @@ export class NuiSmsServiceImplService {
    * loginAccount
    */
   async loginAccount(param: RegisterAccountParam): Promise<number> {
-    const url: string = String.format(LOGIN_ACCOUNT_URL, param.getUsername());
+    const url: string = String.format(LOGIN_ACCOUNT_URL, param.username);
             const body: Record<String, String> = {};
-            body.put("username", param.getUsername());
-            body.put("password", param.getPassword());
+            body.put("username", param.username);
+            body.put("password", param.password);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(url, body);
                 const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
                 if (result == null) {
                     throw new AdminException("登录失败");
                 }
-                param.setSignature(" ");
-                param.setDefaultVal(" ");
+                param.signature = " ";
+                param.defaultVal = " ";
                 setConfig(param);
                 //删除null值 防止序列化报错
                 JacksonUtils.removeNull(result);
@@ -111,22 +111,22 @@ export class NuiSmsServiceImplService {
   async resetPassword(param: RegisterAccountParam): Promise<any> {
     const result: Record<string, any> = new Record<string, any>();
             // 获取用户信息
-            const data: Record<string, any> = accountInfo(param.getUsername());
+            const data: Record<string, any> = accountInfo(param.username);
     
             // 拆分手机号并验证
             const mobiles: string = String(data.getOrDefault("mobiles", ""));
             const mobileList: string[] = [mobiles.split(","]);
-            if (!mobileList.includes(param.getMobile())) {
+            if (!mobileList.includes(param.mobile)) {
                 throw new AdminException("手机号错误");
             }
     
             // 重置密码
             const newPassword: string = null;
             try {
-                const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.getUsername());
+                const resetPasswordUrl: string = String.format(RESET_PASSWORD_URL, param.username);
                 const resetPasswordBody: Record<String, String> = {};
-                resetPasswordBody.put("mobile", param.getMobile());
-                resetPasswordBody.put("code", param.getCode());
+                resetPasswordBody.put("mobile", param.mobile);
+                resetPasswordBody.put("code", param.code);
                 resetPasswordBody.put("key", param.key);
                 const resetPasswordJson: Record<string, any> = NiucloudUtils.Niucloud.put(resetPasswordUrl, resetPasswordBody);
                 const resetPasswordDataJson: Record<string, any> = resetPasswordJson.getRecord<string, any>("data");
@@ -138,8 +138,8 @@ export class NuiSmsServiceImplService {
     
             //修改配置
             const registerAccountParam: RegisterAccountParam = new RegisterAccountParam();
-            registerAccountParam.setUsername(param.getUsername());
-            registerAccountParam.setPassword(param.getPassword());
+            registerAccountParam.username = param.username;
+            registerAccountParam.password = param.password;
             setConfig(registerAccountParam);
     
             result.put("password", newPassword);
@@ -184,7 +184,7 @@ export class NuiSmsServiceImplService {
                 map = list.collect(/* Collectors已删除 */.toMap(SysNotice::getKey, item => item));
             }
             const notice: TemplateListVo[] = [];
-            for (Map.Entry<String, NoticeEnumListVo> noticeMap : NoticeEnum.getNiuyunNotice().entrySet()) {
+            for (Map.Entry<String, NoticeEnumListVo> noticeMap : NoticeEnum.niuyunNotice.entrySet()) {
                 const noticeInfoVo: TemplateListVo = new TemplateListVo();
                 BeanUtil.copyProperties(noticeMap.value, noticeInfoVo);
                 if (map.containsKey(noticeMap.key)) {
@@ -194,13 +194,13 @@ export class NuiSmsServiceImplService {
                 if (CommonUtils.isNotEmpty(noticeMap.value.getSupport_type_map())) {
                     for (Map.Entry<String, Record<string, any>> supportTypeMap : noticeMap.value.getSupport_type_map().entrySet()) {
                         if (supportTypeMap.key === "sms") {
-                            noticeInfoVo.setSms(supportTypeMap.value);
+                            noticeInfoVo.sms = supportTypeMap.value;
                         }
                         if (supportTypeMap.key === "wechat") {
-                            noticeInfoVo.setWechat(supportTypeMap.value);
+                            noticeInfoVo.wechat = supportTypeMap.value;
                         }
                         if (supportTypeMap.key === "weapp") {
-                            noticeInfoVo.setWeapp(supportTypeMap.value);
+                            noticeInfoVo.weapp = supportTypeMap.value;
                         }
                     }
                 }
@@ -221,13 +221,13 @@ export class NuiSmsServiceImplService {
             const result: TemplateListVo[] = [];
             for (const addon of addonList) {
                 for (const noticeInfoVo of notice) {
-                    if (addon.key === noticeInfoVo.getAddon()) {
-                        if ("system".equals(noticeInfoVo.getAddon())) {
-                            noticeInfoVo.setAddon("系统");
+                    if (addon.key === noticeInfoVo.addon) {
+                        if ("system".equals(noticeInfoVo.addon)) {
+                            noticeInfoVo.addon = "系统";
                         }
                         const auditInfo: Record<string, any> = new Record<string, any>();
                         auditInfo.set("audit_msg", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditMsg() : "");
-                        auditInfo.set("audit_status", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditStatus() : TemplateAuditStatus.TEMPLATE_NOT_REPORT.getCode());
+                        auditInfo.set("audit_status", templateMap.containsKey(noticeInfoVo.key) ? templateMap.get(noticeInfoVo.key).getAuditStatus() : TemplateAuditStatus.TEMPLATE_NOT_REPORT.code);
                         auditInfo.set("audit_status_name", TemplateAuditStatus.getByCode(auditInfo.getInt("audit_status")).getDescription());
                         const paramsJson: string[] = [];
                         if (templateMap.containsKey(noticeInfoVo.key)){
@@ -240,8 +240,8 @@ export class NuiSmsServiceImplService {
                         Collections.sort(paramsJson);
     
                         const variable: string[] = [];
-                        if (CommonUtils.isNotEmpty(noticeInfoVo.getVariable())) {
-                            variable.addAll(noticeInfoVo.getVariable().keySet());
+                        if (CommonUtils.isNotEmpty(noticeInfoVo.variable)) {
+                            variable.addAll(noticeInfoVo.variable.keySet());
                         }
                         Collections.sort(variable);
     
@@ -249,11 +249,11 @@ export class NuiSmsServiceImplService {
                         // 比较两个键列表
                         if (templateMap.containsKey(noticeInfoVo.key) && variable !== paramsJson) {
                             if ((!paramsJson || paramsJson.length === 0)) {
-                                errorStatus = String(TemplateAuditStatus.TEMPLATE_NEED_PULL.getCode());
+                                errorStatus = String(TemplateAuditStatus.TEMPLATE_NEED_PULL.code);
                             } else {
-                                errorStatus = auditInfo.getInt("audit_status") == TemplateAuditStatus.TEMPLATE_PASS.getCode()
-                                        ? String(TemplateAuditStatus.TEMPLATE_STATUS_AGAIN_REPORT.getCode())
-                                        : string.valueOf(TemplateAuditStatus.TEMPLATE_NEED_EDIT.getCode());
+                                errorStatus = auditInfo.getInt("audit_status") == TemplateAuditStatus.TEMPLATE_PASS.code
+                                        ? String(TemplateAuditStatus.TEMPLATE_STATUS_AGAIN_REPORT.code)
+                                        : string.valueOf(TemplateAuditStatus.TEMPLATE_NEED_EDIT.code);
                             }
                         }
                         auditInfo.set("error_status", errorStatus);
@@ -262,15 +262,15 @@ export class NuiSmsServiceImplService {
                         }else {
                             auditInfo.set("error_status_name", "");
                         }
-                        noticeInfoVo.setAuditInfo(auditInfo);
+                        noticeInfoVo.auditInfo = auditInfo;
                         if (templateMap.containsKey(noticeInfoVo.key)){
                             const niuSmsTemplate: NiuSmsTemplate = templateMap.get(noticeInfoVo.key);
-                            if (StringUtils.isNotEmpty(niuSmsTemplate.getTemplateType())){
-                                noticeInfoVo.setTemplateTypeName(TemplateTypeEnum.fromCode(number.parseInt(niuSmsTemplate.getTemplateType())).getDescription());
+                            if (StringUtils.isNotEmpty(niuSmsTemplate.templateType)){
+                                noticeInfoVo.templateTypeName = TemplateTypeEnum.fromCode(number.parseInt(niuSmsTemplate.templateType).getDescription());
                             }else {
-                                noticeInfoVo.setTemplateTypeName("");
+                                noticeInfoVo.templateTypeName = "";
                             }
-                            noticeInfoVo.setTemplateId(number.parseInt(niuSmsTemplate.getTemplateId()));
+                            noticeInfoVo.templateId = number.parseInt(niuSmsTemplate.templateId);
                         }
                         result.push(noticeInfoVo);
                     }
@@ -287,10 +287,10 @@ export class NuiSmsServiceImplService {
             const result: Record<string, any> = null;
             try {
                 const orderListParam: Record<String, Object> = {};
-                orderListParam.put("out_trade_no", param.getOutTradeNo());
+                orderListParam.put("out_trade_no", param.outTradeNo);
                 orderListParam.put("order_status", param.status);
-                orderListParam.put("create_time_start", param.getCreateTimeStart());
-                orderListParam.put("create_time_end", param.getCreateTimeEnd());
+                orderListParam.put("create_time_start", param.createTimeStart);
+                orderListParam.put("create_time_end", param.createTimeEnd);
                 orderListParam.put("limit", pageParam.limit);
                 orderListParam.put("page", pageParam.page);
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderListUrl, orderListParam);
@@ -310,9 +310,9 @@ export class NuiSmsServiceImplService {
   async accountSendList(pageParam: PageParam, username: string, param: SendListParam): Promise<number> {
     const accountSendUrl: string = String.format(ACCOUNT_SEND_LIST_URL, username);
             const accountSendParam: Record<String, Object> = {};
-            accountSendParam.put("mobile", param.getMobile());
-            accountSendParam.put("content", param.getContent());
-            accountSendParam.put("smsStatus", param.getSmsStatus());
+            accountSendParam.put("mobile", param.mobile);
+            accountSendParam.put("content", param.content);
+            accountSendParam.put("smsStatus", param.smsStatus);
             accountSendParam.put("limit", pageParam.limit);
             accountSendParam.put("page", pageParam.page);
             try {
@@ -344,10 +344,10 @@ export class NuiSmsServiceImplService {
                         (config.getRecord<string, any>(NIUYUN)).get("signature").toString().isEmpty()) {
                     throw new AdminException("需登录账号并配置签名后才能启用牛云短信");
                 }
-                registerAccountParam.setDefaultVal(NIUYUN);
+                registerAccountParam.defaultVal = NIUYUN;
                 setConfig(registerAccountParam);
             } else {
-                registerAccountParam.setDefaultVal(" ");
+                registerAccountParam.defaultVal = " ";
                 setConfig(registerAccountParam);
             }
   }
@@ -358,15 +358,15 @@ export class NuiSmsServiceImplService {
   async editAccount(username: string, param: EditAccountParam): Promise<number> {
     const editAccountUrl: string = String.format(ACCOUNT_EDIT_URL, username);
             const editAccountBody: Record<String, Object> = {};
-            editAccountBody.put("new_mobile", param.getNewMobile());
-            editAccountBody.put("mobile", param.getMobile());
-            editAccountBody.put("code", param.getCode());
+            editAccountBody.put("new_mobile", param.newMobile);
+            editAccountBody.put("mobile", param.mobile);
+            editAccountBody.put("code", param.code);
             editAccountBody.put("key", param.key);
-            editAccountBody.put("signature", param.getSignature());
+            editAccountBody.put("signature", param.signature);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.put(editAccountUrl, editAccountBody);
                 const registerAccountParam: RegisterAccountParam = new RegisterAccountParam();
-                registerAccountParam.setSignature(param.getSignature());
+                registerAccountParam.signature = param.signature;
                 setConfig(registerAccountParam);
                 JacksonUtils.removeNull(jsonObject);
                 return jsonObject;
@@ -381,19 +381,19 @@ export class NuiSmsServiceImplService {
    */
   async signDelete(username: string, param: SignDeleteParam): Promise<any> {
     const config: Record<string, any> = getConfig(false);
-            param.setPassword(config.getStr("password"));
+            param.password = config.getStr("password");
             try {
                 const failList: Object[] = delSign(username, param);
     
                 const configSignature: string = config.getStr("signature");
-                const signatures: string[] = param.getSignatures();
+                const signatures: string[] = param.signatures;
     
                 if (signatures != null && (failList && failList.length > 0) &&
                         signatures.includes(configSignature) &&
                         !failList.includes(configSignature)) {
                     // 如果满足条件，则清空账户的签名
                     const editAccountParam: EditAccountParam = new EditAccountParam();
-                    editAccountParam.setSignature("");
+                    editAccountParam.signature = "";
                     editAccount(username, editAccountParam);
                 }
                 return failList;
@@ -407,8 +407,8 @@ export class NuiSmsServiceImplService {
    * signCreate
    */
   async signCreate(username: string, param: RegisterAccountParam): Promise<any> {
-    if (CommonUtils.isNotEmpty(param.getImgUrl())) {
-                param.setImgUrl(RequestUtils.getReqeustURI(, param.getImgUrl()).toString());
+    if (CommonUtils.isNotEmpty(param.imgUrl)) {
+                param.imgUrl = RequestUtils.getReqeustURI(, param.imgUrl.toString());
             }
             const signCreateUrl: string = String.format(SIGN_ADD_URL, username);
             try {
@@ -429,14 +429,14 @@ export class NuiSmsServiceImplService {
    */
   async getSmsPackageList(param: SmsPackageParam): Promise<any> {
     const pageListParam: Record<String, Object> = {};
-            pageListParam.put("package_name", param.getPackageName());
-            pageListParam.put("sms_num", param.getSmsNum());
-            pageListParam.put("price_start", param.getPriceStart());
-            pageListParam.put("price_end", param.getPriceEnd());
-            pageListParam.put("original_price_start", param.getOriginalPriceStart());
-            pageListParam.put("original_price_end", param.getOriginalPriceEnd());
-            pageListParam.put("time_start", param.getTimeStart());
-            pageListParam.put("time_end", param.getTimeEnd());
+            pageListParam.put("package_name", param.packageName);
+            pageListParam.put("sms_num", param.smsNum);
+            pageListParam.put("price_start", param.priceStart);
+            pageListParam.put("price_end", param.priceEnd);
+            pageListParam.put("original_price_start", param.originalPriceStart);
+            pageListParam.put("original_price_end", param.originalPriceEnd);
+            pageListParam.put("time_start", param.timeStart);
+            pageListParam.put("time_end", param.timeEnd);
             pageListParam.put("page", 1);
             pageListParam.put("limit", 15);
             try {
@@ -457,7 +457,7 @@ export class NuiSmsServiceImplService {
   async orderCalculate(username: string, param: OrderCalculateParam): Promise<any> {
     const orderCalculateUrl: string = String.format(ORDER_CALCULATE_URL, username);
             const orderCalculateBody: Record<String, Object> = {};
-            orderCalculateBody.put("package_id", param.getPackageId());
+            orderCalculateBody.put("package_id", param.packageId);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCalculateUrl, orderCalculateBody);
                 const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -476,7 +476,7 @@ export class NuiSmsServiceImplService {
   async createOrder(username: string, param: OrderCalculateParam): Promise<any> {
     const orderCreateUrl: string = String.format(ORDER_CREATE_URL, username);
             const orderCreateBody: Record<String, Object> = {};
-            orderCreateBody.put("package_id", param.getPackageId());
+            orderCreateBody.put("package_id", param.packageId);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.post(orderCreateUrl, orderCreateBody);
                 const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
@@ -496,8 +496,8 @@ export class NuiSmsServiceImplService {
     const request: HttpServletRequest = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
     
             const protocol: string = request.isSecure() ? "https" : "http";
-            const host: string = request.getServerName();
-            const port: number = request.getServerPort();
+            const host: string = request.serverName;
+            const port: number = request.serverPort;
             if (port != 80 && port != 443) {
                 host += ":" + port;
             }
@@ -557,7 +557,7 @@ export class NuiSmsServiceImplService {
    * templateCreate
    */
   async templateCreate(username: string, smsType: string, param: TemplateCreateParam): Promise<any> {
-    const templateKey: string = param.getTemplateKey();
+    const templateKey: string = param.templateKey;
             const templateList: TemplateListVo[] = getTemplateList(smsType, username);
     
             // 查找模版信息，如果不存在则抛出异常
@@ -567,7 +567,7 @@ export class NuiSmsServiceImplService {
                     .orElseThrow(() => new AdminException("当前模版未配置短信内容"));
     
             // 检查模版是否配置了短信内容，如果未配置则抛出异常
-            if (CommonUtils.isEmpty(templateInfo.getSms()) || CommonUtils.isEmpty(templateInfo.getSms().get("content"))) {
+            if (CommonUtils.isEmpty(templateInfo.sms) || CommonUtils.isEmpty(templateInfo.sms.get("content"))) {
                 throw new AdminException("当前模版未配置短信内容");
             }
     
@@ -575,7 +575,7 @@ export class NuiSmsServiceImplService {
             const modelInfo: NiuSmsTemplate[] = this.niuSmsTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
                     .eq("site_id", this.requestContext.siteId)
                     .eq("username", username));
-            if (!CollectionUtils.isEmpty(modelInfo) && TemplateAuditStatus.TEMPLATE_PASS.getCode().toString() === modelInfo.get(0.getAuditStatus())) {
+            if (!CollectionUtils.isEmpty(modelInfo) && TemplateAuditStatus.TEMPLATE_PASS.code.toString() === modelInfo.get(0.auditStatus)) {
                 throw new AdminException("审核通过的模版不允许修改");
             }
     
@@ -583,12 +583,12 @@ export class NuiSmsServiceImplService {
             const templateCreateUrl: string = String.format(TEMPLATE_ADD_URL, username);
             const templateCreateBody: Record<String, Object> = {};
             templateCreateBody.put("temName", path.basename(templateInfo));
-            templateCreateBody.put("temType", param.getTemplateType());
-            templateCreateBody.put("temContent", templateInfo.getSms().get("content"));
-            templateCreateBody.put("paramJson", param.getParamsJson());
+            templateCreateBody.put("temType", param.templateType);
+            templateCreateBody.put("temContent", templateInfo.sms.get("content"));
+            templateCreateBody.put("paramJson", param.paramsJson);
             templateCreateBody.put("extend", Map.of("template_key", templateKey));
             templateCreateBody.put("signature", config.getStr("signature"));
-            templateCreateBody.put("temId", param.getTemplateId());
+            templateCreateBody.put("temId", param.templateId);
     
             Record<string, any> result;
             try {
@@ -606,20 +606,20 @@ export class NuiSmsServiceImplService {
             if (CollectionUtils.isEmpty(modelInfo)) {
                 const niuSmsTemplate: NiuSmsTemplate = new NiuSmsTemplate();
                 niuSmsTemplate.siteId = this.requestContext.siteId;
-                niuSmsTemplate.setSmsType(smsType);
-                niuSmsTemplate.setUsername(username);
-                niuSmsTemplate.setTemplateKey(templateKey);
-                niuSmsTemplate.setAuditStatus(TemplateAuditStatus.TEMPLATE_WAIT.getCode().toString());
-                niuSmsTemplate.setTemplateId(temId.toString());
-                niuSmsTemplate.setReportInfo(JSONUtil.toJsonStr(result));
+                niuSmsTemplate.smsType = smsType;
+                niuSmsTemplate.username = username;
+                niuSmsTemplate.templateKey = templateKey;
+                niuSmsTemplate.auditStatus = TemplateAuditStatus.TEMPLATE_WAIT.code.toString();
+                niuSmsTemplate.templateId = temId.toString();
+                niuSmsTemplate.reportInfo = JSONUtil.toJsonStr(result);
                 niuSmsTemplate.createTime = Date.now( / 1000);
                 niuSmsTemplate.updateTime = Date.now( / 1000);
                 this.niuSmsTemplateRepository.save(niuSmsTemplate);
             } else {
                 const niuSmsTemplate: NiuSmsTemplate = modelInfo.get(0);
-                niuSmsTemplate.setAuditStatus(TemplateAuditStatus.TEMPLATE_WAIT.getCode().toString());
-                niuSmsTemplate.setTemplateId(temId.toString());
-                niuSmsTemplate.setReportInfo(JSONUtil.toJsonStr(result));
+                niuSmsTemplate.auditStatus = TemplateAuditStatus.TEMPLATE_WAIT.code.toString();
+                niuSmsTemplate.templateId = temId.toString();
+                niuSmsTemplate.reportInfo = JSONUtil.toJsonStr(result);
                 niuSmsTemplate.updateTime = Date.now( / 1000);
                 niuSmsTemplateMapper.updateById(niuSmsTemplate);
             }
@@ -661,15 +661,15 @@ export class NuiSmsServiceImplService {
             }
             const orderCreateUrl: string = String.format(TEMPLATE_INFO_URL, username);
             const templateInfoParam: Record<String, Object> = {};
-            templateInfoParam.put("tem_id", niuSmsTemplate.getTemplateId());
+            templateInfoParam.put("tem_id", niuSmsTemplate.templateId);
             try {
                 const jsonObject: Record<string, any> = NiucloudUtils.Niucloud.get(orderCreateUrl, templateInfoParam);
                 const result: Record<string, any> = jsonObject.getRecord<string, any>("data");
                 //删除null值 防止序列化报错
                 JacksonUtils.removeNull(result);
                 const auditStatus: string = result.containsKey("auditResult") && CommonUtils.isNotEmpty(result.getRecord<string, any>("auditResult"))
-                        ? result.getStr("auditResult") : niuSmsTemplate.getAuditStatus();
-                niuSmsTemplate.setAuditStatus(auditStatus);
+                        ? result.getStr("auditResult") : niuSmsTemplate.auditStatus;
+                niuSmsTemplate.auditStatus = auditStatus;
                 niuSmsTemplateMapper.updateById(niuSmsTemplate);
                 return niuSmsTemplate;
             } catch (e) {
@@ -699,13 +699,13 @@ export class NuiSmsServiceImplService {
    */
   async setConfig(param: RegisterAccountParam): Promise<any> {
     const config: Record<string, any> = getConfig(true);
-            config.put("default", CommonUtils.isNotEmpty(param.getDefaultVal()) ? param.getDefaultVal() : config.getOrDefault("default", ""));
+            config.put("default", CommonUtils.isNotEmpty(param.defaultVal) ? param.defaultVal : config.getOrDefault("default", ""));
             const niuSmsConfig: Record<string, any> = config.getRecord<string, any>(NIUYUN);
             const newNiuSmsConfig: Record<String, Object> = {};
-            newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.getUsername()) ? param.getUsername() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : "");
-            newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.getPassword()) ? param.getPassword() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : "");
-            newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.getSignature()) ? param.getSignature() : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : "");
+            newNiuSmsConfig.put("username", CommonUtils.isNotEmpty(param.username) ? param.username : niuSmsConfig != null ? niuSmsConfig.getOrDefault("username", "") : "");
+            newNiuSmsConfig.put("password", CommonUtils.isNotEmpty(param.password) ? param.password : niuSmsConfig != null ? niuSmsConfig.getOrDefault("password", "") : "");
+            newNiuSmsConfig.put("signature", CommonUtils.isNotEmpty(param.signature) ? param.signature : niuSmsConfig != null ? niuSmsConfig.getOrDefault("signature", "") : "");
             config.put(NIUYUN, newNiuSmsConfig);
-            this.coreConfigService.setConfig(this.requestContext.siteId, "SMS", config);
+            this.coreConfigService.config = this.requestContext.siteId, "SMS", config;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-channel-service-impl.service.ts

@@ -41,17 +41,17 @@ export class PayChannelServiceImplService {
                     const value: string = data.getRecord<string, any>("config").getStr(key, "");
                     if (!value.includes("*")) config.set(key, value);
                 }
-                payChannel.setConfig(config.toString());
-                payChannel.setSort(data.getInt("sort"));
+                payChannel.config = config.toString();
+                payChannel.sort = data.getInt("sort");
                 payChannel.status = data.getInt("status");
                 payChannelMapper.updateById(payChannel);
             } else {
                 const model: PayChannel = new PayChannel();
                 model.siteId = this.requestContext.siteId;
-                model.setChannel(channel);
+                model.channel = channel;
                 model.type = type;
-                model.setConfig(data.getRecord<string, any>("config").toString());
-                model.setSort(data.getInt("sort"));
+                model.config = data.getRecord<string, any>("config".toString());
+                model.sort = data.getInt("sort");
                 model.status = data.getInt("status");
                 this.payChannelRepository.save(model);
             }
@@ -90,7 +90,7 @@ export class PayChannelServiceImplService {
                             }
                         }
                     }
-                    vo.setConfig(config.toString());
+                    vo.config = config.toString();
                 }
                 list.push(vo);
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-refund-service-impl.service.ts

@@ -22,7 +22,7 @@ export class PayRefundServiceImplService {
     
             any /* TODO: QueryWrapper<PayRefund> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
-            if (CommonUtils.isNotEmpty(searchParam.getRefundNo())) queryWrapper.eq("refund_no", searchParam.getRefundNo());
+            if (CommonUtils.isNotEmpty(searchParam.refundNo)) queryWrapper.eq("refund_no", searchParam.refundNo);
             if (CommonUtils.isNotEmpty(searchParam.status)) queryWrapper.eq("status", searchParam.status);
             if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime);
             queryWrapper.orderByDesc("id");
@@ -34,7 +34,7 @@ export class PayRefundServiceImplService {
             for (const item of iPageRecords) {
                 const vo: PayRefundListVo = new PayRefundListVo();
                 Object.assign(vo, item);
-                vo.setTypeName(payTypeEnum.getByPath(vo.type + ".name", String.class));
+                vo.typeName = payTypeEnum.getByPath(vo.type + ".name", String.class);
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-service-impl.service.ts

@@ -54,24 +54,24 @@ export class PayServiceImplService {
   async add(addParam: PayParam): Promise<any> {
     const model: Pay = new Pay();
             model.siteId = addParam.siteId;
-            model.setMainId(addParam.getMainId());
-            model.setOutTradeNo(addParam.getOutTradeNo());
-            model.setTradeType(addParam.getTradeType());
-            model.setTradeId(addParam.getTradeId());
-            model.setTradeNo(addParam.getTradeNo());
-            model.setBody(addParam.getBody());
-            model.setMoney(addParam.getMoney());
-            model.setVoucher(addParam.getVoucher());
+            model.mainId = addParam.mainId;
+            model.outTradeNo = addParam.outTradeNo;
+            model.tradeType = addParam.tradeType;
+            model.tradeId = addParam.tradeId;
+            model.tradeNo = addParam.tradeNo;
+            model.body = addParam.body;
+            model.money = addParam.money;
+            model.voucher = addParam.voucher;
             model.status = addParam.status;
-            model.setJson(addParam.getJson());
+            model.json = addParam.json;
             model.createTime = Date.now( / 1000);
-            model.setPayTime(addParam.getPayTime());
-            model.setCancelTime(addParam.getCancelTime());
+            model.payTime = addParam.payTime;
+            model.cancelTime = addParam.cancelTime;
             model.type = addParam.type;
-            model.setMchId(addParam.getMchId());
-            model.setMainType(addParam.getMainType());
-            model.setChannel(addParam.getChannel());
-            model.setFailReason(addParam.getFailReason());
+            model.mchId = addParam.mchId;
+            model.mainType = addParam.mainType;
+            model.channel = addParam.channel;
+            model.failReason = addParam.failReason;
             this.payRepository.save(model);
   }
 
@@ -85,23 +85,23 @@ export class PayServiceImplService {
             if (!model) throw new BadRequestException("数据不存在!");
             model.id = id;
             model.siteId = editParam.siteId;
-            model.setMainId(editParam.getMainId());
-            model.setOutTradeNo(editParam.getOutTradeNo());
-            model.setTradeType(editParam.getTradeType());
-            model.setTradeId(editParam.getTradeId());
-            model.setTradeNo(editParam.getTradeNo());
-            model.setBody(editParam.getBody());
-            model.setMoney(editParam.getMoney());
-            model.setVoucher(editParam.getVoucher());
+            model.mainId = editParam.mainId;
+            model.outTradeNo = editParam.outTradeNo;
+            model.tradeType = editParam.tradeType;
+            model.tradeId = editParam.tradeId;
+            model.tradeNo = editParam.tradeNo;
+            model.body = editParam.body;
+            model.money = editParam.money;
+            model.voucher = editParam.voucher;
             model.status = editParam.status;
-            model.setJson(editParam.getJson());
-            model.setPayTime(editParam.getPayTime());
-            model.setCancelTime(editParam.getCancelTime());
+            model.json = editParam.json;
+            model.payTime = editParam.payTime;
+            model.cancelTime = editParam.cancelTime;
             model.type = editParam.type;
-            model.setMchId(editParam.getMchId());
-            model.setMainType(editParam.getMainType());
-            model.setChannel(editParam.getChannel());
-            model.setFailReason(editParam.getFailReason());
+            model.mchId = editParam.mchId;
+            model.mainType = editParam.mainType;
+            model.channel = editParam.channel;
+            model.failReason = editParam.failReason;
             payMapper.updateById(model);
   }
 
@@ -121,22 +121,22 @@ export class PayServiceImplService {
    * getFriendspayInfoByTrade
    */
   async getFriendspayInfoByTrade(param: GetFriendspayInfoByTradeParam): Promise<any> {
-    const payInfo: GetInfoByTradeVo = this.corePayService.getInfoByTrade(this.requestContext.siteId, param.getTradeType(), param.getTradeId(), param.getChannel(), "friendspay");
+    const payInfo: GetInfoByTradeVo = this.corePayService.getInfoByTrade(this.requestContext.siteId, param.tradeType, param.tradeId, param.channel, "friendspay");
             if (CommonUtils.isEmpty(payInfo)) {
                 return new FriendsPayInfoByTradeVo();
             }
     
             const vo: FriendsPayInfoByTradeVo = new FriendsPayInfoByTradeVo();
             Object.assign(vo, payInfo);
-            vo.setConfig(payInfo.config);
+            vo.config = payInfo.config;
             vo.createTime = DateUtils.timestampToString(payInfo.createTime);
     
-            if (payInfo.getCancelTime() > 0) {
-                vo.setCancelTime(DateUtils.timestampToString(payInfo.getCancelTime()));
+            if (payInfo.cancelTime > 0) {
+                vo.cancelTime = DateUtils.timestampToString(payInfo.cancelTime);
             }
     
-            if (payInfo.getPayTime() > 0) {
-                vo.setPayTime(DateUtils.timestampToString(payInfo.getPayTime()));
+            if (payInfo.payTime > 0) {
+                vo.payTime = DateUtils.timestampToString(payInfo.payTime);
             }
     
             any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper();
@@ -147,18 +147,18 @@ export class PayServiceImplService {
     
             const poster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
             if (CommonUtils.isNotEmpty(poster)) {
-                vo.setPosterId(poster.id);
+                vo.posterId = poster.id;
             }
     
             any /* TODO: QueryWrapper<Member> */ memberQueryWrapper = new QueryWrapper();
             memberQueryWrapper.eq("site_id", this.requestContext.siteId)
-                    .eq("member_id", vo.getMainId());
+                    .eq("member_id", vo.mainId);
             const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
-            vo.setMember(member);
+            vo.member = member;
     
-            const qrcode: QR = getQrcode(param.getTradeType(), param.getTradeId(), param.getChannel());
-            vo.setLink(qrcode.link);
-            vo.setQrcode(qrcode.qrcode);
+            const qrcode: QR = getQrcode(param.tradeType, param.tradeId, param.channel);
+            vo.link = qrcode.link;
+            vo.qrcode = qrcode.qrcode;
             return vo;
   }
 

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/pay/impl/pay-transfer-service-impl.service.ts

@@ -18,19 +18,19 @@ export class PayTransferServiceImplService {
   async setSceneId(param: SetSceneIdParam): Promise<any> {
     const config: Record<string, any> = this.coreTransferSceneService.getWechatTransferSceneConfig(this.requestContext.siteId);
     
-            const tradeScenelist: Record<String, TransferSceneEnum> = TransferSceneEnum.getWechatTransferSceneMap();
-            if (!tradeScenelist.containsKey(param.getScene())) {
+            const tradeScenelist: Record<String, TransferSceneEnum> = TransferSceneEnum.wechatTransferSceneMap;
+            if (!tradeScenelist.containsKey(param.scene)) {
                 throw new BadRequestException("不存在的商户转账场景");
             }
     
-            config.put(param.getScene(), param.getSceneId());
-            this.coreTransferSceneService.setWechatTransferSceneConfig(this.requestContext.siteId, config);
+            config.put(param.scene, param.sceneId);
+            this.coreTransferSceneService.wechatTransferSceneConfig = this.requestContext.siteId, config;
   }
 
   /**
    * setTradeScene
    */
   async setTradeScene(param: SetTradeSceneParam): Promise<any> {
-    this.coreTransferSceneService.setTradeScene(this.requestContext.siteId, param.type, param);
+    this.coreTransferSceneService.tradeScene = this.requestContext.siteId, param.type, param;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-account-log-service-impl.service.ts

@@ -22,8 +22,8 @@ export class SiteAccountLogServiceImplService {
             any /* TODO: QueryWrapper<SiteAccountLog> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
             //查询条件判断组装
-            if (CommonUtils.isNotEmpty(searchParam.getTradeNo())) {
-                queryWrapper.like("trade_no", searchParam.getTradeNo());
+            if (CommonUtils.isNotEmpty(searchParam.tradeNo)) {
+                queryWrapper.like("trade_no", searchParam.tradeNo);
             }
             if (CommonUtils.isNotEmpty(searchParam.type)) {
                 queryWrapper.eq("type", searchParam.type);
@@ -49,7 +49,7 @@ export class SiteAccountLogServiceImplService {
                     typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
                                     .last("limit 1"));
                 }
-                vo.setPayInfo(typeModel);
+                vo.payInfo = typeModel;
                 list.push(vo);
             }
     
@@ -79,7 +79,7 @@ export class SiteAccountLogServiceImplService {
                 typeModel = this.payTransferRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
                                 .last("limit 1"));
             }
-            vo.setPayInfo(typeModel);
+            vo.payInfo = typeModel;
             return vo;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-group-service-impl.service.ts

@@ -24,8 +24,8 @@ export class SiteGroupServiceImplService {
             const limit: number = pageParam.limit;
     
             any /* TODO: QueryWrapper<SiteGroup> */ queryWrapper = new QueryWrapper();
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords())) {
-                queryWrapper.like("group_name", searchParam.getKeywords());
+            if (CommonUtils.isNotEmpty(searchParam.keywords)) {
+                queryWrapper.like("group_name", searchParam.keywords);
             }
             queryWrapper.orderByDesc("group_id");
     
@@ -36,15 +36,15 @@ export class SiteGroupServiceImplService {
             const list: SiteGroupListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: SiteGroupListVo = new SiteGroupListVo();
-                vo.setGroupId(item.getGroupId());
-                vo.setGroupName(item.getGroupName());
-                vo.setGroupDesc(item.getGroupDesc());
+                vo.groupId = item.groupId;
+                vo.groupName = item.groupName;
+                vo.groupDesc = item.groupDesc;
                 vo.createTime = item.createTime;
                 vo.updateTime = item.updateTime;
-                const addonJson: JSONArray = JSONUtil.parseArray(item.getAddon());
-                vo.setAddon(addonJson);
-                const appJson: JSONArray = JSONUtil.parseArray(item.getApp());
-                vo.setApp(appJson);
+                const addonJson: JSONArray = JSONUtil.parseArray(item.addon);
+                vo.addon = addonJson;
+                const appJson: JSONArray = JSONUtil.parseArray(item.app);
+                vo.app = appJson;
                 const addonStr: string[] = [];
                 const appStr: string[] = [];
                 const appList: SiteGroupListVo.IconAndTitle[] = [];
@@ -75,13 +75,13 @@ export class SiteGroupServiceImplService {
                         appList.push(iconAndTitle);
                     }
                 }
-                vo.setAddonName(addonStr);
-                vo.setAppName(appStr);
-                vo.setAddonList(addonListResult);
-                vo.setAppList(appList);
+                vo.addonName = addonStr;
+                vo.appName = appStr;
+                vo.addonList = addonListResult;
+                vo.appList = appList;
                 list.push(vo);
             }
-            return PageResult.build(iPage.getCurrent(), iPage.getSize(), iPageTotal).setData(list);
+            return PageResult.build(iPage.current, iPage.size, iPageTotal).setData(list);
   }
 
   /**
@@ -109,15 +109,15 @@ export class SiteGroupServiceImplService {
    */
   async add(addParam: SiteGroupAddParam): Promise<any> {
     const groupRoles: JSONArray = new JSONArray();
-            groupRoles.addAll(addParam.getAddon());
-            groupRoles.addAll(addParam.getApp());
+            groupRoles.addAll(addParam.addon);
+            groupRoles.addAll(addParam.app);
             /**判断应用是否全部是有效的已安装应用 */
             checkAddon(groupRoles);
             const model: SiteGroup = new SiteGroup();
-            model.setGroupName(addParam.getGroupName());
-            model.setGroupDesc(addParam.getGroupDesc());
-            model.setApp(JSONUtil.toJsonStr(addParam.getApp()));
-            model.setAddon(JSONUtil.toJsonStr(addParam.getAddon()));
+            model.groupName = addParam.groupName;
+            model.groupDesc = addParam.groupDesc;
+            model.app = JSONUtil.toJsonStr(addParam.app);
+            model.addon = JSONUtil.toJsonStr(addParam.addon);
             model.createTime = DateUtils.currTime();
             model.updateTime = DateUtils.currTime();
             this.siteGroupRepository.save(model);
@@ -133,29 +133,29 @@ export class SiteGroupServiceImplService {
             if (!model) throw new BadRequestException("数据不存在!");
     
             const groupRoles: JSONArray = new JSONArray();
-            groupRoles.addAll(editParam.getAddon());
-            groupRoles.addAll(editParam.getApp());
+            groupRoles.addAll(editParam.addon);
+            groupRoles.addAll(editParam.app);
             /**判断应用是否全部是有效的已安装应用 */
             checkAddon(groupRoles);
     
             const group: SiteGroup = new SiteGroup();
-            group.setGroupId(id);
-            group.setGroupId(editParam.getGroupId());
-            group.setGroupName(editParam.getGroupName());
-            group.setGroupDesc(editParam.getGroupDesc());
-            group.setApp(JSONUtil.toJsonStr(editParam.getApp()));
-            group.setAddon(JSONUtil.toJsonStr(editParam.getAddon()));
+            group.groupId = id;
+            group.groupId = editParam.groupId;
+            group.groupName = editParam.groupName;
+            group.groupDesc = editParam.groupDesc;
+            group.app = JSONUtil.toJsonStr(editParam.app);
+            group.addon = JSONUtil.toJsonStr(editParam.addon);
             group.updateTime = DateUtils.currTime();
             siteGroupMapper.updateById(group);
             this.cached.remove("site_group_menu_ids" + id);
-            if (!model.getApp() === group.getApp()) {
+            if (!model.app === group.app) {
                 // 修改站点应用
                 const siteModel: Site = new Site();
-                siteModel.setApp(model.getApp());
+                siteModel.app = model.app;
                 this.siteRepository.save(siteModel, /* TODO: any /* TODO: QueryWrapper<Site> */需改写为TypeORM的where条件对象 */.eq("group_id", id));
             }
     
-            if (!model.getApp() === group.getApp() || !model.getAddon() === group.getAddon()) {
+            if (!model.app === group.app || !model.addon === group.addon) {
                 const siteList: Site[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }));
                 if (CommonUtils.isNotEmpty(siteList)) {
                     for (const site of siteList) {
@@ -186,7 +186,7 @@ export class SiteGroupServiceImplService {
    * checkAddon
    */
   async checkAddon(jsonArray: JSONArray): Promise<any> {
-    const addonListVoMap: Record<String, InstallAddonListVo> = this.coreAddonService.getInstallAddonList();
+    const addonListVoMap: Record<String, InstallAddonListVo> = this.coreAddonService.installAddonList;
             const keys: string[] = new ArrayList<>(addonListVoMap.keySet());
             const addonString: string[] = JSONUtil.toList(jsonArray, String.class);
             keys.retainAll(addonString);
@@ -205,7 +205,7 @@ export class SiteGroupServiceImplService {
             for (const siteGroup of siteGroupList) {
                 const siteGroupListVo: SiteGroupListVo = new SiteGroupListVo();
                 Object.assign(siteGroupListVo, siteGroup);
-                siteGroupListVo.setSiteNum(getUserSiteGroupSiteNum(uid, siteGroup.getGroupId()));
+                siteGroupListVo.siteNum = getUserSiteGroupSiteNum(uid, siteGroup.groupId);
                 siteGroupListVoList.push(siteGroupListVo);
             }
             return siteGroupListVoList;
@@ -216,7 +216,7 @@ export class SiteGroupServiceImplService {
    */
   async getUserSiteGroupSiteNum(uid: number, groupId: number): Promise<any> {
     MPJany /* TODO: QueryWrapper<SysUserRole> */ userRoleMPJQueryWrapper = new MPJQueryWrapper();
-            userRoleMPJQueryWrapper.setAlias("sur")
+            userRoleMPJQueryWrapper.alias = "sur"
                     .leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix));
             userRoleMPJQueryWrapper.eq("sur.uid", uid);
             userRoleMPJQueryWrapper.eq("sur.is_admin", 1);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-service-impl.service.ts

@@ -27,22 +27,22 @@ export class SiteServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<Site> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("se")
+            queryWrapper.alias = "se"
                     .selectAll(Site.class)
                     .select("sg.group_name")
                     .leftJoin("?_site_group sg on sg.group_id = se.group_id".replace("?_", this.appConfig.tablePrefix));
     
     
             //查询条件判断组装
-            if (CommonUtils.isNotEmpty(searchParam.getKeywords())) {
-                queryWrapper.like("se.siteName", searchParam.getKeywords()).or().like("se.siteName", searchParam.getKeywords());
+            if (CommonUtils.isNotEmpty(searchParam.keywords)) {
+                queryWrapper.like("se.siteName", searchParam.keywords).or().like("se.siteName", searchParam.keywords);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getApp())) {
+            if (CommonUtils.isNotEmpty(searchParam.app)) {
                 queryWrapper.and(wrapper => wrapper
-                        .like("sg.addon", searchParam.getApp())
+                        .like("sg.addon", searchParam.app)
                         .or()
-                        .like("sg.app", searchParam.getApp())
+                        .like("sg.app", searchParam.app)
                 );
             }
     
@@ -50,12 +50,12 @@ export class SiteServiceImplService {
                 queryWrapper.eq("se.status", searchParam.status);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getGroupId())) {
-                queryWrapper.eq("se.group_id", searchParam.getGroupId());
+            if (CommonUtils.isNotEmpty(searchParam.groupId)) {
+                queryWrapper.eq("se.group_id", searchParam.groupId);
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getSiteDomain())) {
-                queryWrapper.like("se.site_domain", searchParam.getSiteDomain());
+            if (CommonUtils.isNotEmpty(searchParam.siteDomain)) {
+                queryWrapper.like("se.site_domain", searchParam.siteDomain);
             }
             queryWrapper.ne("se.app_type", "admin");
             if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -72,9 +72,9 @@ export class SiteServiceImplService {
                 }
             }
     
-            if (CommonUtils.isNotEmpty(searchParam.getExpireTime())) {
+            if (CommonUtils.isNotEmpty(searchParam.expireTime)) {
     
-                const expireTime: string[] = searchParam.getExpireTime();
+                const expireTime: string[] = searchParam.expireTime;
                 const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]);
                 const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]);
                 if (startTime > 0 && endTime > 0) {
@@ -100,7 +100,7 @@ export class SiteServiceImplService {
                         .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
                 userRoleMPJQueryWrapper.eq("nsur.is_admin", 1);
                 userRoleMPJQueryWrapper.eq("nsur.site_id", item.siteId);
-                vo.setAdmin(sysUserRoleMapper.selectJoinOne(SiteAdminVo.class, userRoleMPJQueryWrapper));
+                vo.admin = sysUserRoleMapper.selectJoinOne(SiteAdminVo.class, userRoleMPJQueryWrapper);
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal, list);
@@ -117,36 +117,36 @@ export class SiteServiceImplService {
    * add
    */
   async add(addParam: SiteAddParam): Promise<any> {
-    const siteGroup: SiteGroup = this.siteGroupService.info(addParam.getGroupId());
+    const siteGroup: SiteGroup = this.siteGroupService.info(addParam.groupId);
             if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) {
                 throw new BadRequestException("SITE_GROUP_NOT_EXIST");
             }
             const model: Site = new Site();
-            model.setSiteName(addParam.getSiteName());
-            model.setGroupId(addParam.getGroupId());
-            model.setAppType(AppTypeEnum.path.basename(SITE));
+            model.siteName = addParam.siteName;
+            model.groupId = addParam.groupId;
+            model.appType = AppTypeEnum.path.basename(SITE);
             model.createTime = DateUtils.currTime();
-            model.setExpireTime(DateUtils.StringToTimestamp(addParam.getExpireTime()));
-            model.setApp(siteGroup.getApp());
-            model.setAddons("");
-            model.setSiteDomain(addParam.getSiteDomain());
+            model.expireTime = DateUtils.StringToTimestamp(addParam.expireTime);
+            model.app = siteGroup.app;
+            model.addons = "";
+            model.siteDomain = addParam.siteDomain;
             this.siteRepository.save(model);
             const siteId: number = model.siteId;
-            if (ObjectUtil.isNull(addParam.getUid()) || addParam.getUid() == 0) {
+            if (ObjectUtil.isNull(addParam.uid) || addParam.uid == 0) {
                 //添加用户
                 const siteUserParam: SiteUserParam = new SiteUserParam();
-                siteUserParam.setUsername(addParam.getUsername());
-                siteUserParam.setHeadImg("");
+                siteUserParam.username = addParam.username;
+                siteUserParam.headImg = "";
                 siteUserParam.status = 1;
-                siteUserParam.setRealName(addParam.getRealName());
-                siteUserParam.setPassword(addParam.getPassword());
-                siteUserParam.setIsAdmin(1);
+                siteUserParam.realName = addParam.realName;
+                siteUserParam.password = addParam.password;
+                siteUserParam.isAdmin = 1;
                 this.sysUserService.addSiteUser(siteUserParam, siteId);
             } else {
                 const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
-                sysUserRoleParam.setUid(addParam.getUid());
-                sysUserRoleParam.setRoleIds(new JsonArray().toString());
-                sysUserRoleParam.setIsAdmin(1);
+                sysUserRoleParam.uid = addParam.uid;
+                sysUserRoleParam.roleIds = new JsonArray(.toString());
+                sysUserRoleParam.isAdmin = 1;
                 sysUserRoleParam.siteId = siteId;
                 this.userRoleService.push(sysUserRoleParam);
             }
@@ -155,13 +155,13 @@ export class SiteServiceImplService {
             event.siteId = siteId;
             event.addAppSign("core");
             event.name = "SiteAddAfterEvent";
-            event.setSite(model);
-            event.setSiteGroup(siteGroup);
+            event.site = model;
+            event.siteGroup = siteGroup;
             EventAndSubscribeOfPublisher.publishAll(event);
     
             const param: Record<String, Object> = {};
             param.put("site_id", siteId);
-            param.put("main_app", siteGroup.getApp());
+            param.put("main_app", siteGroup.app);
             param.put("tag", "add");
             this.diyService.loadDiyData(param);
   }
@@ -174,32 +174,32 @@ export class SiteServiceImplService {
                             .last("limit 1"));
     
             if (!model) throw new BadRequestException("数据不存在!");
-            if (ObjectUtil.isNotNull(editParam.getGroupId()) && CommonUtils.isNotEmpty(editParam.getGroupId()) && !editParam.getGroupId() === model.getGroupId()) {
-                model.setGroupId(editParam.getGroupId());
+            if (ObjectUtil.isNotNull(editParam.groupId) && CommonUtils.isNotEmpty(editParam.groupId) && !editParam.groupId === model.groupId) {
+                model.groupId = editParam.groupId;
             }
-            if (ObjectUtil.isNotNull(editParam.getSiteName()) && CommonUtils.isNotEmpty(editParam.getSiteName())) {
-                model.setSiteName(editParam.getSiteName());
+            if (ObjectUtil.isNotNull(editParam.siteName) && CommonUtils.isNotEmpty(editParam.siteName)) {
+                model.siteName = editParam.siteName;
             }
     
-            const oldSiteGroup: SiteGroup = this.siteGroupService.info(model.getGroupId());
+            const oldSiteGroup: SiteGroup = this.siteGroupService.info(model.groupId);
     
             const initallJsonArray: JSONArray = new JSONArray();
-            if (ObjectUtil.isNull(model.getInitalledAddon()) || CommonUtils.isEmpty(model.getInitalledAddon())) {
-                initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.getApp()));
-                initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.getAddon()));
+            if (ObjectUtil.isNull(model.initalledAddon) || CommonUtils.isEmpty(model.initalledAddon)) {
+                initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.app));
+                initallJsonArray.addAll(JSONUtil.parseArray(oldSiteGroup.addon));
             }
     
-            const siteGroup: SiteGroup = this.siteGroupService.info(editParam.getGroupId());
+            const siteGroup: SiteGroup = this.siteGroupService.info(editParam.groupId);
             if (ObjectUtil.isNull(siteGroup) || CommonUtils.isEmpty(siteGroup)) {
                 throw new BadRequestException("SITE_GROUP_NOT_EXIST");
             }
-            initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.getApp()));
-            initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.getAddon()));
+            initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.app));
+            initallJsonArray.addAll(JSONUtil.parseArray(siteGroup.addon));
     
-            model.setInitalledAddon(JSONUtil.toJsonStr(initallJsonArray));
-            model.setSiteDomain(editParam.getSiteDomain());
-            model.setExpireTime(new DateTime(editParam.getExpireTime()).getTime() / 1000);
-            model.status = model.getExpireTime( > DateUtils.currTime() ? SiteStatusEnum.ON.getCode() : SiteStatusEnum.EXPIRE.getCode());
+            model.initalledAddon = JSONUtil.toJsonStr(initallJsonArray);
+            model.siteDomain = editParam.siteDomain;
+            model.expireTime = new DateTime(editParam.expireTime.getTime() / 1000);
+            model.status = model.expireTime > DateUtils.currTime( ? SiteStatusEnum.ON.code : SiteStatusEnum.EXPIRE.code);
             siteMapper.updateById(model);
     
             this.coreSiteService.clearSiteCache(id);
@@ -208,8 +208,8 @@ export class SiteServiceImplService {
             event.siteId = model.siteId;
             event.addAppSign("core");
             event.name = "SiteEditAfterEvent";
-            event.setSite(model);
-            event.setSiteGroup(siteGroup);
+            event.site = model;
+            event.siteGroup = siteGroup;
             EventAndSubscribeOfPublisher.publishAll(event);
   }
 
@@ -253,8 +253,8 @@ export class SiteServiceImplService {
                         deleteMethod.invoke(mapper, wrapper);
                     } catch (e) {
                         log.error("删除表数据失败: {} | 原因: {}",
-                                entityClass.getSimpleName(),
-                                e.getCause() != null ? e.getCause().getMessage() : e.message);
+                                entityClass.simpleName,
+                                e.cause != null ? e.cause.message : e.message);
                     }
                 }
     
@@ -268,14 +268,14 @@ export class SiteServiceImplService {
                 this.siteRepository.delete(id);
             } catch (e) {
                 log.error("删除站点失败: {}", e.message, e);
-                throw new BadRequestException("删除失败: " + (e.getCause() != null ? e.getCause().getMessage() : e.message));
+                throw new BadRequestException("删除失败: " + (e.cause != null ? e.cause.message : e.message));
             }
     
             // 清理缓存
             if (delResult > 0 && siteUserRoles != null) {
                 siteUserRoles.forEach(userRole => {
-                    cached.remove("user_role_" + userRole.getUid() + "_" + id);
-                    cached.remove("user_role_list_" + userRole.getUid());
+                    cached.remove("user_role_" + userRole.uid + "_" + id);
+                    cached.remove("user_role_list_" + userRole.uid);
                 });
             }
             cached.remove("site_cache_" + id);
@@ -287,7 +287,7 @@ export class SiteServiceImplService {
   async closeSite(siteId: number): Promise<any> {
     const model: Site = new Site();
             model.siteId = siteId;
-            model.status = SiteStatusEnum.CLOSE.getCode();
+            model.status = SiteStatusEnum.CLOSE.code;
             siteMapper.updateById(model);
             this.coreSiteService.clearSiteCache(siteId);
   }
@@ -298,7 +298,7 @@ export class SiteServiceImplService {
   async openSite(siteId: number): Promise<any> {
     const model: Site = new Site();
             model.siteId = siteId;
-            model.status = SiteStatusEnum.ON.getCode();
+            model.status = SiteStatusEnum.ON.code;
             siteMapper.updateById(model);
             this.coreSiteService.clearSiteCache(siteId);
   }
@@ -326,17 +326,17 @@ export class SiteServiceImplService {
                 queryWrapper.eq("status", siteSearchParam.status);
             }
     
-            if (CommonUtils.isNotEmpty(siteSearchParam.getGroupId())) {
-                queryWrapper.eq("group_id", siteSearchParam.getGroupId());
+            if (CommonUtils.isNotEmpty(siteSearchParam.groupId)) {
+                queryWrapper.eq("group_id", siteSearchParam.groupId);
             }
     
             if (CommonUtils.isNotEmpty(siteSearchParam.appType)) {
                 queryWrapper.eq("app_type", siteSearchParam.appType);
             }
     
-            if (CommonUtils.isNotEmpty(siteSearchParam.getExpireTime())) {
+            if (CommonUtils.isNotEmpty(siteSearchParam.expireTime)) {
     
-                const expireTime: string[] = siteSearchParam.getExpireTime();
+                const expireTime: string[] = siteSearchParam.expireTime;
                 const startTime: number = (expireTime[0] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[0]);
                 const endTime: number = (expireTime[1] == null) ? 0 : DateUtils.StringToTimestamp(expireTime[1]);
                 if (startTime > 0 && endTime > 0) {
@@ -368,8 +368,8 @@ export class SiteServiceImplService {
             event.siteId = site.siteId;
             event.addAppSign("core");
             event.name = "SiteEditAfterEvent";
-            event.setSite(site);
-            event.setSiteGroup(siteGroup);
+            event.site = site;
+            event.siteGroup = siteGroup;
             this.coreSiteService.clearSiteCache(site.siteId);
             EventAndSubscribeOfPublisher.publishAll(event);
   }
@@ -406,7 +406,7 @@ export class SiteServiceImplService {
             }
     
             const showList: Record<String, Object> = showCustomer(false);
-            const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.getAll();
+            const addonChildMenus: AddonChildMenuEnum.MenuConfig[] = AddonChildMenuEnum.all;
     
             const menuList: SpecialMenuListVo.MenuVo[] = [];
     
@@ -426,19 +426,19 @@ export class SiteServiceImplService {
                     }
                 }
                 SpecialMenuListVo.const tempMenu: MenuVo = new SpecialMenuListVo.MenuVo();
-                tempMenu.setMenuName(path.basename(item));
-                tempMenu.setMenuKey(item.key);
-                tempMenu.setMenuShortName(item.getShortName());
-                tempMenu.setParentKey("addon");
-                tempMenu.setMenuType("0");
+                tempMenu.menuName = path.basename(item);
+                tempMenu.menuKey = item.key;
+                tempMenu.menuShortName = item.shortName;
+                tempMenu.parentKey = "addon";
+                tempMenu.menuType = "0";
                 tempMenu.icon = "iconfont iconzhuangxiu3";
-                tempMenu.setApiUrl("");
-                tempMenu.setRouterPath("");
-                tempMenu.setViewPath("");
-                tempMenu.setMethods("");
-                tempMenu.setSort(item.getSort());
+                tempMenu.apiUrl = "";
+                tempMenu.routerPath = "";
+                tempMenu.viewPath = "";
+                tempMenu.methods = "";
+                tempMenu.sort = item.sort;
                 tempMenu.status = "1";
-                tempMenu.setIsShow("1");
+                tempMenu.isShow = "1";
     
                 const children: SpecialMenuListVo.MenuVo[] = [];
                 const authChildren: JSONArray = addonMenu.getJSONArray("children");
@@ -453,12 +453,12 @@ export class SiteServiceImplService {
                     }
                 }
     
-                tempMenu.setChildren(children);
+                tempMenu.children = children;
                 menuList.push(tempMenu);
             }
             const result: SpecialMenuListVo = new SpecialMenuListVo();
-            result.setParentKey("addon");
-            result.setList(menuList);
+            result.parentKey = "addon";
+            result.list = menuList;
     
             return result;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/site/impl/site-user-service-impl.service.ts

@@ -25,8 +25,8 @@ export class SiteUserServiceImplService {
             userRoleMPJQueryWrapper.select("nsur.id, nsur.is_admin, nsu.status, nsur.site_id, nsur.role_ids, nsu.uid, nsu.username, nsu.head_img, nsu.real_name, nsu.last_ip, nsu.last_time, nsu.create_time, nsu.login_count")
                     .setAlias("nsur")
                     .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
-            if(ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())){
-                userRoleMPJQueryWrapper.like("nsu.username", searchParam.getUsername());
+            if(ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)){
+                userRoleMPJQueryWrapper.like("nsu.username", searchParam.username);
             }
             userRoleMPJQueryWrapper.eq("nsur.site_id", this.requestContext.siteId);
             userRoleMPJQueryWrapper.isNotNull("nsu.uid");
@@ -35,15 +35,15 @@ export class SiteUserServiceImplService {
             [SiteUserVo[], number] iPage = sysUserRoleMapper.selectJoinPage(new Page<>(page, limit), SiteUserVo.class, userRoleMPJQueryWrapper);
             for (const siteUserVo of iPageRecords) {
                 const roleArray: string[] = [];
-                if(CommonUtils.isNotEmpty(siteUserVo.getRoleIds()) && JSONUtil.parseArray(siteUserVo.getRoleIds()).size()>0){
+                if(CommonUtils.isNotEmpty(siteUserVo.roleIds) && JSONUtil.parseArray(siteUserVo.roleIds).size()>0){
                     any /* TODO: QueryWrapper<SysRole> */ roleQueryWrapper=new QueryWrapper();
-                    roleQueryWrapper.in("role_id", JSONUtil.parseArray(siteUserVo.getRoleIds()));
+                    roleQueryWrapper.in("role_id", JSONUtil.parseArray(siteUserVo.roleIds));
                     const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
                     for (const sysRole of roleList) {
-                        roleArray.push(sysRole.getRoleName());
+                        roleArray.push(sysRole.roleName);
                     }
                 }
-                siteUserVo.setRoleArray(roleArray);
+                siteUserVo.roleArray = roleArray;
             }
             return PageResult.build(page, limit, iPageTotal).setData(iPageRecords);
   }
@@ -52,7 +52,7 @@ export class SiteUserServiceImplService {
    * add
    */
   async add(siteUserParam: SiteUserParam): Promise<any> {
-    if (siteUserParam.getUsername().matches(".*[\\u4e00-\\u9fa5].*")){
+    if (siteUserParam.username.matches(".*[\\u4e00-\\u9fa5].*")){
                 throw new AdminException("用户名不能包含中文");
             }
             this.sysUserService.addSiteUser(siteUserParam, this.requestContext.siteId);
@@ -79,20 +79,20 @@ export class SiteUserServiceImplService {
   async edit(uid: number, siteUserParam: SiteUserParam): Promise<any> {
     try{
                 const sysUserParam: SysUserParam = new SysUserParam();
-                sysUserParam.setHeadImg(siteUserParam.getHeadImg());
-                if(CommonUtils.isNotEmpty(siteUserParam.getPassword())){
-                    sysUserParam.setPassword(siteUserParam.getPassword());
+                sysUserParam.headImg = siteUserParam.headImg;
+                if(CommonUtils.isNotEmpty(siteUserParam.password)){
+                    sysUserParam.password = siteUserParam.password;
                 }
-                sysUserParam.setUsername(siteUserParam.getUsername());
+                sysUserParam.username = siteUserParam.username;
                 sysUserParam.status = siteUserParam.status;
-                sysUserParam.setRealName(siteUserParam.getRealName());
+                sysUserParam.realName = siteUserParam.realName;
                 this.sysUserService.edit(uid, sysUserParam);
                 //创建用户站点管理权限
-                const roleIds: string[] = siteUserParam.getRoleIds();
+                const roleIds: string[] = siteUserParam.roleIds;
                 const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
                 sysUserRoleParam.siteId = this.requestContext.siteId;
-                sysUserRoleParam.setRoleIds(JSONUtil.toJsonStr(roleIds));
-                sysUserRoleParam.setUid(uid);
+                sysUserRoleParam.roleIds = JSONUtil.toJsonStr(roleIds);
+                sysUserRoleParam.uid = uid;
                 sysUserRoleParam.status = siteUserParam.status;
                 this.sysUserRoleService.edit(sysUserRoleParam);
             }catch (e){
@@ -127,7 +127,7 @@ export class SiteUserServiceImplService {
                 throw new BadRequestException("用户不存在");
             }
             const sysUserRole: SysUserRole = sysUserRoleList.get(0);
-            if (sysUserRole.getIsAdmin() == 1){
+            if (sysUserRole.isAdmin == 1){
                 throw new BadRequestException("超级管理员不允许删除");
             }
             this.sysUserRepository.delete(uid);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-hour-service-impl.service.ts

@@ -52,38 +52,38 @@ export class StatHourServiceImplService {
   async add(addParam: StatHourParam): Promise<any> {
     const model: StatHour = new StatHour();
             model.siteId = addParam.siteId;
-            model.setAddon(addParam.getAddon());
-            model.setField(addParam.getField());
-            model.setFieldTotal(addParam.getFieldTotal());
-            model.setYear(addParam.getYear());
-            model.setMonth(addParam.getMonth());
-            model.setDay(addParam.getDay());
-            model.setStartTime(Date.now() / 1000);
-            model.setLastTime(addParam.getLastTime());
-            model.setHour0(addParam.getHour0());
-            model.setHour1(addParam.getHour1());
-            model.setHour2(addParam.getHour2());
-            model.setHour3(addParam.getHour3());
-            model.setHour4(addParam.getHour4());
-            model.setHour5(addParam.getHour5());
-            model.setHour6(addParam.getHour6());
-            model.setHour7(addParam.getHour7());
-            model.setHour8(addParam.getHour8());
-            model.setHour9(addParam.getHour9());
-            model.setHour10(addParam.getHour10());
-            model.setHour11(addParam.getHour11());
-            model.setHour12(addParam.getHour12());
-            model.setHour13(addParam.getHour13());
-            model.setHour14(addParam.getHour14());
-            model.setHour15(addParam.getHour15());
-            model.setHour16(addParam.getHour16());
-            model.setHour17(addParam.getHour17());
-            model.setHour18(addParam.getHour18());
-            model.setHour19(addParam.getHour19());
-            model.setHour20(addParam.getHour20());
-            model.setHour21(addParam.getHour21());
-            model.setHour22(addParam.getHour22());
-            model.setHour23(addParam.getHour23());
+            model.addon = addParam.addon;
+            model.field = addParam.field;
+            model.fieldTotal = addParam.fieldTotal;
+            model.year = addParam.year;
+            model.month = addParam.month;
+            model.day = addParam.day;
+            model.startTime = Date.now( / 1000);
+            model.lastTime = addParam.lastTime;
+            model.hour0 = addParam.hour0;
+            model.hour1 = addParam.hour1;
+            model.hour2 = addParam.hour2;
+            model.hour3 = addParam.hour3;
+            model.hour4 = addParam.hour4;
+            model.hour5 = addParam.hour5;
+            model.hour6 = addParam.hour6;
+            model.hour7 = addParam.hour7;
+            model.hour8 = addParam.hour8;
+            model.hour9 = addParam.hour9;
+            model.hour10 = addParam.hour10;
+            model.hour11 = addParam.hour11;
+            model.hour12 = addParam.hour12;
+            model.hour13 = addParam.hour13;
+            model.hour14 = addParam.hour14;
+            model.hour15 = addParam.hour15;
+            model.hour16 = addParam.hour16;
+            model.hour17 = addParam.hour17;
+            model.hour18 = addParam.hour18;
+            model.hour19 = addParam.hour19;
+            model.hour20 = addParam.hour20;
+            model.hour21 = addParam.hour21;
+            model.hour22 = addParam.hour22;
+            model.hour23 = addParam.hour23;
             this.statHourRepository.save(model);
   }
 
@@ -97,37 +97,37 @@ export class StatHourServiceImplService {
             if (!model) throw new BadRequestException("数据不存在!");
             model.id = id;
             model.siteId = editParam.siteId;
-            model.setAddon(editParam.getAddon());
-            model.setField(editParam.getField());
-            model.setFieldTotal(editParam.getFieldTotal());
-            model.setYear(editParam.getYear());
-            model.setMonth(editParam.getMonth());
-            model.setDay(editParam.getDay());
-            model.setLastTime(editParam.getLastTime());
-            model.setHour0(editParam.getHour0());
-            model.setHour1(editParam.getHour1());
-            model.setHour2(editParam.getHour2());
-            model.setHour3(editParam.getHour3());
-            model.setHour4(editParam.getHour4());
-            model.setHour5(editParam.getHour5());
-            model.setHour6(editParam.getHour6());
-            model.setHour7(editParam.getHour7());
-            model.setHour8(editParam.getHour8());
-            model.setHour9(editParam.getHour9());
-            model.setHour10(editParam.getHour10());
-            model.setHour11(editParam.getHour11());
-            model.setHour12(editParam.getHour12());
-            model.setHour13(editParam.getHour13());
-            model.setHour14(editParam.getHour14());
-            model.setHour15(editParam.getHour15());
-            model.setHour16(editParam.getHour16());
-            model.setHour17(editParam.getHour17());
-            model.setHour18(editParam.getHour18());
-            model.setHour19(editParam.getHour19());
-            model.setHour20(editParam.getHour20());
-            model.setHour21(editParam.getHour21());
-            model.setHour22(editParam.getHour22());
-            model.setHour23(editParam.getHour23());
+            model.addon = editParam.addon;
+            model.field = editParam.field;
+            model.fieldTotal = editParam.fieldTotal;
+            model.year = editParam.year;
+            model.month = editParam.month;
+            model.day = editParam.day;
+            model.lastTime = editParam.lastTime;
+            model.hour0 = editParam.hour0;
+            model.hour1 = editParam.hour1;
+            model.hour2 = editParam.hour2;
+            model.hour3 = editParam.hour3;
+            model.hour4 = editParam.hour4;
+            model.hour5 = editParam.hour5;
+            model.hour6 = editParam.hour6;
+            model.hour7 = editParam.hour7;
+            model.hour8 = editParam.hour8;
+            model.hour9 = editParam.hour9;
+            model.hour10 = editParam.hour10;
+            model.hour11 = editParam.hour11;
+            model.hour12 = editParam.hour12;
+            model.hour13 = editParam.hour13;
+            model.hour14 = editParam.hour14;
+            model.hour15 = editParam.hour15;
+            model.hour16 = editParam.hour16;
+            model.hour17 = editParam.hour17;
+            model.hour18 = editParam.hour18;
+            model.hour19 = editParam.hour19;
+            model.hour20 = editParam.hour20;
+            model.hour21 = editParam.hour21;
+            model.hour22 = editParam.hour22;
+            model.hour23 = editParam.hour23;
             statHourMapper.updateById(model);
   }
 

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/stat/impl/stat-service-impl.service.ts

@@ -24,38 +24,38 @@ export class StatServiceImplService {
             const statToDayVo: StatToDayVo = new StatToDayVo();
             //总会员数
             const totalMemberCount: number = this.coreMemberService.getMemberCount(new MemberStatSearchParam());
-            statToDayVo.setTotalMemberCount(totalMemberCount);
+            statToDayVo.totalMemberCount = totalMemberCount;
     
             //今天注册总会员数
             const todayMemberParam: MemberStatSearchParam = new MemberStatSearchParam();
             todayMemberParam.createTime = createTimes;
-            statToDayVo.setTodayMemberCount(this.coreMemberService.getMemberCount(todayMemberParam));
+            statToDayVo.todayMemberCount = this.coreMemberService.getMemberCount(todayMemberParam);
             //总站点数
-            statToDayVo.setTotalSiteCount(this.siteService.getSiteCountByCondition(new SiteSearchParam()));
+            statToDayVo.totalSiteCount = this.siteService.getSiteCountByCondition(new SiteSearchParam());
             //今日站点数
             const todaySiteParam: SiteSearchParam = new SiteSearchParam();
             todaySiteParam.createTime = createTimes;
-            todaySiteParam.setAppType(AppTypeEnum.path.basename(SITE));
-            statToDayVo.setTodaySiteCount(this.siteService.getSiteCountByCondition(todaySiteParam));
+            todaySiteParam.appType = AppTypeEnum.path.basename(SITE);
+            statToDayVo.todaySiteCount = this.siteService.getSiteCountByCondition(todaySiteParam);
             //正常站点数
             const normaSiteParam: SiteSearchParam = new SiteSearchParam();
             normaSiteParam.status = 1;
-            normaSiteParam.setAppType(AppTypeEnum.path.basename(SITE));
-            statToDayVo.setNormaSiteCount(this.siteService.getSiteCountByCondition(normaSiteParam));
+            normaSiteParam.appType = AppTypeEnum.path.basename(SITE);
+            statToDayVo.normaSiteCount = this.siteService.getSiteCountByCondition(normaSiteParam);
             //到期站点数
             const expireSiteParam: SiteSearchParam = new SiteSearchParam();
             expireSiteParam.status = 2;
-            expireSiteParam.setAppType(AppTypeEnum.path.basename(SITE));
-            statToDayVo.setExpireSiteCount(this.siteService.getSiteCountByCondition(expireSiteParam));
+            expireSiteParam.appType = AppTypeEnum.path.basename(SITE);
+            statToDayVo.expireSiteCount = this.siteService.getSiteCountByCondition(expireSiteParam);
             //即将到期站点数
             const weekExpireSiteParam: SiteSearchParam = new SiteSearchParam();
             const expireTimes: string[] = new String[2];
             expireTimes[0] = DateUtils.currDate();
             expireTimes[1] = DateUtils.getDateAddDay(7);
             weekExpireSiteParam.status = 1;
-            weekExpireSiteParam.setExpireTime(expireTimes);
-            weekExpireSiteParam.setAppType(AppTypeEnum.path.basename(SITE));
-            statToDayVo.setWeekExpireSiteCount(this.siteService.getSiteCountByCondition(weekExpireSiteParam));
+            weekExpireSiteParam.expireTime = expireTimes;
+            weekExpireSiteParam.appType = AppTypeEnum.path.basename(SITE);
+            statToDayVo.weekExpireSiteCount = this.siteService.getSiteCountByCondition(weekExpireSiteParam);
     
             /**
              * 系统数据类
@@ -63,8 +63,8 @@ export class StatServiceImplService {
             const statSystemVo: StatSystemVo = new StatSystemVo();
             statSystemVo = this.systemService.info;
     
-            statInfoVo.setTodayData(statToDayVo);
-            statInfoVo.setSystem(statSystemVo);
+            statInfoVo.todayData = statToDayVo;
+            statInfoVo.system = statSystemVo;
     
             /**
              * 站点、会员数据统计数据
@@ -90,13 +90,13 @@ export class StatServiceImplService {
                 const itemSiteCount: number = this.siteService.getSiteCountByCondition(itemSiteParam);
                 siteValues.push(itemSiteCount);
             }
-            memberCountVo.setDate(dates);
+            memberCountVo.date = dates;
             memberCountVo.value = memberValues;
-            siteCountVo.setDate(dates);
+            siteCountVo.date = dates;
             siteCountVo.value = siteValues;
     
-            statInfoVo.setMemberCountStat(memberCountVo);
-            statInfoVo.setSiteStat(siteCountVo);
+            statInfoVo.memberCountStat = memberCountVo;
+            statInfoVo.siteStat = siteCountVo;
     
             /**
              * 会员性别类型统计
@@ -109,16 +109,16 @@ export class StatServiceImplService {
     
             const sexCountList: number[] = [];
             const sexMemberParam: MemberStatSearchParam = new MemberStatSearchParam();
-            sexMemberParam.setSex(SexEnum.MAN.value);
+            sexMemberParam.sex = SexEnum.MAN.value;
             const manSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam);
-            sexMemberParam.setSex(SexEnum.WOMAN.value);
+            sexMemberParam.sex = SexEnum.WOMAN.value;
             const womanSexCount: number = this.coreMemberService.getMemberCount(sexMemberParam);
             sexCountList.push(manSexCount);
             sexCountList.push(womanSexCount);
             sexCountList.push(totalMemberCount - manSexCount - womanSexCount);
             memberStat.type = sexlist;
             memberStat.value = sexCountList;
-            statInfoVo.setMemberStat(memberStat);
+            statInfoVo.memberStat = memberStat;
     
             /**
              * 站点分组 统计
@@ -127,26 +127,26 @@ export class StatServiceImplService {
             const grouplist: string[] = [];
             const groupCountList: number[] = [];
     
-            const groupList: SiteGroup[] = this.siteGroupService.getAll();
+            const groupList: SiteGroup[] = this.siteGroupService.all;
             for (const siteGroup of groupList) {
-                grouplist.push(siteGroup.getGroupName());
+                grouplist.push(siteGroup.groupName);
                 const siteGroupParam: SiteSearchParam = new SiteSearchParam();
-                siteGroupParam.setGroupId(siteGroup.getGroupId());
+                siteGroupParam.groupId = siteGroup.groupId;
                 groupCountList.push(this.siteService.getSiteCountByCondition(siteGroupParam));
             }
             siteGroupStat.type = grouplist;
             siteGroupStat.value = groupCountList;
-            statInfoVo.setSiteGroupStat(siteGroupStat);
+            statInfoVo.siteGroupStat = siteGroupStat;
             /**
              * 所有应用安装统计
              */
             const appVo: StatAppVo = new StatAppVo();
-            const totalAddonCount: number = this.coreAddonService.getLocalAddonCount();
+            const totalAddonCount: number = this.coreAddonService.localAddonCount;
             const installAddonCount: number = this.coreAddonService.getAddonCountByCondition(new CoreAddonSearchParam());
-            appVo.setAppCount(totalAddonCount);
-            appVo.setAppInstalledCount(installAddonCount);
-            appVo.setAppNoInstalledCount(Math.max(totalAddonCount - installAddonCount, 0));
-            statInfoVo.setApp(appVo);
+            appVo.appCount = totalAddonCount;
+            appVo.appInstalledCount = installAddonCount;
+            appVo.appNoInstalledCount = Math.max(totalAddonCount - installAddonCount, 0);
+            statInfoVo.app = appVo;
             return statInfoVo;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-agreement-service-impl.service.ts

@@ -41,6 +41,6 @@ export class SysAgreementServiceImplService {
    * setAgreement
    */
   async setAgreement(key: string, title: string, content: string): Promise<any> {
-    this.coreAgreementService.setAgreement(this.requestContext.siteId, key, title, content);
+    this.coreAgreementService.agreement = this.requestContext.siteId, key, title, content;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-attachment-service-impl.service.ts

@@ -28,16 +28,16 @@ export class SysAttachmentServiceImplService {
             any /* TODO: QueryWrapper<SysAttachment> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
             queryWrapper.orderByDesc("att_id");
-            if (CommonUtils.isNotEmpty(searchParam.getAttType())) queryWrapper.eq("att_type", searchParam.getAttType());
-            if (CommonUtils.isNotEmpty(searchParam.getCateId()) && searchParam.getCateId() > 0) queryWrapper.eq("cate_id", searchParam.getCateId());
-            if (CommonUtils.isNotEmpty(searchParam.getRealName())) queryWrapper.like("real_name", searchParam.getRealName());
+            if (CommonUtils.isNotEmpty(searchParam.attType)) queryWrapper.eq("att_type", searchParam.attType);
+            if (CommonUtils.isNotEmpty(searchParam.cateId) && searchParam.cateId > 0) queryWrapper.eq("cate_id", searchParam.cateId);
+            if (CommonUtils.isNotEmpty(searchParam.realName)) queryWrapper.like("real_name", searchParam.realName);
     
             [SysAttachment[], number] iPage = this.sysAttachmentRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: SysAttachmentListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: SysAttachmentListVo = new SysAttachmentListVo();
                 Object.assign(vo, item);
-                vo.setThumb(CommonUtils.thumbImageSmall(item.siteId, item.path));
+                vo.thumb = CommonUtils.thumbImageSmall(item.siteId, item.path);
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -48,8 +48,8 @@ export class SysAttachmentServiceImplService {
    */
   async image(param: AttachmentUploadParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setAttType("image");
-            param.setDir("attachment/image/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/");
+            param.attType = "image";
+            param.dir = "attachment/image/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
             return this.coreUploadService.upload(param);
   }
 
@@ -58,8 +58,8 @@ export class SysAttachmentServiceImplService {
    */
   async video(param: AttachmentUploadParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setAttType("video");
-            param.setDir("attachment/video/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/");
+            param.attType = "video";
+            param.dir = "attachment/video/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
             return this.coreUploadService.upload(param);
   }
 
@@ -68,10 +68,10 @@ export class SysAttachmentServiceImplService {
    */
   async document(param: AttachmentUploadParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setIsAttachment(0);
-            param.setAttType("document");
-            param.setStorageType("local");
-            param.setDir("attachment/document/" + param.getDocumentType() + "/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/");
+            param.isAttachment = 0;
+            param.attType = "document";
+            param.storageType = "local";
+            param.dir = "attachment/document/" + param.documentType + "/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
             return this.coreUploadService.upload(param);
   }
 
@@ -80,10 +80,10 @@ export class SysAttachmentServiceImplService {
    */
   async batchMoveCategory(param: SysAttachmentMoveParam): Promise<any> {
     const model: SysAttachment = new SysAttachment();
-            model.setCateId(param.getCateId());
+            model.cateId = param.cateId;
             this.sysAttachmentRepository.save(model, /* TODO: any /* TODO: QueryWrapper<SysAttachment> */需改写为TypeORM的where条件对象 */
                     .eq("site_id", this.requestContext.siteId)
-                    .in("att_id", param.getAttIds()));
+                    .in("att_id", param.attIds));
   }
 
   /**
@@ -91,14 +91,14 @@ export class SysAttachmentServiceImplService {
    */
   async del(param: SysAttachmentDelParam): Promise<any> {
     const sysAttachmentList: SysAttachment[] = this.sysAttachmentRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))
-                            .in("att_id", param.getAttIds()));
+                            .in("att_id", param.attIds));
             if ((!sysAttachmentList || sysAttachmentList.length === 0)) {
                 throw new BadRequestException("请选择要删除的附件");
             }
             for (const sysAttachment of sysAttachmentList) {
-                this.coreUploadService.delete(sysAttachment.siteId, sysAttachment.getStorageType(), sysAttachment.path);
+                this.coreUploadService.delete(sysAttachment.siteId, sysAttachment.storageType, sysAttachment.path);
             }
-            this.sysAttachmentRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).in("att_id", param.getAttIds()));
+            this.sysAttachmentRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).in("att_id", param.attIds));
   }
 
   /**

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-backup-records-service-impl.service.ts

@@ -29,8 +29,8 @@ export class SysBackupRecordsServiceImplService {
             queryWrapper.orderByDesc("create_time");
     
             if (searchParam != null) {
-                if (searchParam.getContent() != null) {
-                    queryWrapper.like("content", searchParam.getContent());
+                if (searchParam.content != null) {
+                    queryWrapper.like("content", searchParam.content);
                 }
             }
     
@@ -40,9 +40,9 @@ export class SysBackupRecordsServiceImplService {
                 const vo: SysBackupRecordsListVo = new SysBackupRecordsListVo();
                 Object.assign(vo, item);
                 vo.createTime = DateUtils.timestampToString(item.createTime);
-                vo.setCompleteTime(DateUtils.timestampToString(item.getCompleteTime()));
-                vo.setStatusName(BackupRecordStatusEnum.getNameByStatus(vo.status));
-                vo.setBackupDir("webroot/runtime/upgrade/"+vo.getBackupKey()+"/backup");
+                vo.completeTime = DateUtils.timestampToString(item.completeTime);
+                vo.statusName = BackupRecordStatusEnum.getNameByStatus(vo.status);
+                vo.backupDir = "webroot/runtime/upgrade/"+vo.backupKey+"/backup";
                 list.push(vo);
             }
     
@@ -83,21 +83,21 @@ export class SysBackupRecordsServiceImplService {
   async del(delParam: SysBackupRecordsDelParam): Promise<any> {
     const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */;
     
-            if (delParam.getIds() instanceof ArrayList<?>) {
+            if (delParam.ids instanceof ArrayList<?>) {
                 const intArray: number[] = [];
-                ((ArrayList<?>) delParam.getIds()).forEach(item => {
+                ((ArrayList<?>) delParam.ids).forEach(item => {
                     if (!item) throw new BadRequestException("id不能为空");
                     intArray.push(item);
                 });
                 queryWrapper.in("id", intArray);
             } else {
-                queryWrapper.eq("id", delParam.getIds());
+                queryWrapper.eq("id", delParam.ids);
             }
     
             const backupRecords: SysBackupRecords[] = this.sysBackupRecordsRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
             if (CommonUtils.isNotEmpty(backupRecords)) {
                 for (const item of backupRecords) {
-                    const file: string = backupDir(item.getBackupKey(), "backup");
+                    const file: string = backupDir(item.backupKey, "backup");
                     if (fs.existsSync(file)) {
                         try {
                             fs.rmSync(file, { recursive: true, force: true });
@@ -127,43 +127,43 @@ export class SysBackupRecordsServiceImplService {
                 steps.put("restoreSql", new BackupTaskVo.Step("restoreSql", "恢复数据库备份"));
                 steps.put("restoreComplete", new BackupTaskVo.Step("restoreComplete", "恢复完成"));
                 vo.key = RandomUtil.randomString(10);
-                vo.setSteps(steps);
-                vo.setStep("startRestore");
-                vo.getExecuted().add("startRestore");
-                vo.setContent("开始恢复");
-                vo.setTask("");
+                vo.steps = steps;
+                vo.step = "startRestore";
+                vo.executed.add("startRestore");
+                vo.content = "开始恢复";
+                vo.task = "";
     
                 const addParam: SysBackupRecordsParam = new SysBackupRecordsParam();
-                addParam.setBackupKey(vo.key);
+                addParam.backupKey = vo.key;
                 addParam.status = BackupRecordStatusEnum.STATUS_READY.status;
-                addParam.setContent("自动备份");
+                addParam.content = "自动备份";
                 addParam.version = this.appConfig.version;
                 add(addParam);
             }
-            vo.setBackupRecord(record);
-            if (!vo.getTask() === "") return vo;
+            vo.backupRecord = record;
+            if (!vo.task === "") return vo;
     
-            const steps: string[] = vo.getSteps().keySet().stream();
-            const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : "";
+            const steps: string[] = vo.steps.keySet().stream();
+            const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
     
             if ((step && step.length > 0)) {
-                if (!vo.getExecuted().includes(step)) {
-                    vo.getExecuted().add(step);
+                if (!vo.executed.includes(step)) {
+                    vo.executed.add(step);
                 }
                 try {
                     const param: Record<String, Object> = null;
                     param = (Record<String, Object>) dynamicMethodCall(step, vo);
                     if (param != null) {
-                        vo.setParams(param);
+                        vo.params = param;
                     } else {
-                        vo.setStep(step);
-                        vo.setParams(null);
+                        vo.step = step;
+                        vo.params = null;
                     }
                     setBackupRestoreTaskCache(vo);
                 } catch (e) {
-                    vo.setStep(step);
-                    vo.setTask("fail");
-                    vo.setContent("备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.getBackupKey() +"/backup，失败原因：" + e.message);
+                    vo.step = step;
+                    vo.task = "fail";
+                    vo.content = "备份恢复失败，稍后请手动恢复，备份文件路径：webroot/runtime/upgrade/"+ record.backupKey +"/backup，失败原因：" + e.message;
                     setBackupRestoreTaskCache(vo);
                     // 删除备份记录
                     this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })));
@@ -184,39 +184,39 @@ export class SysBackupRecordsServiceImplService {
             if (vo == null) {
                 vo = new BackupTaskVo();
                 vo.key = RandomUtil.randomString(10);
-                vo.setStep("startBackup");
-                vo.getExecuted().add("startBackup");
-                vo.setContent("开始备份");
+                vo.step = "startBackup";
+                vo.executed.add("startBackup");
+                vo.content = "开始备份";
     
                 const addParam: SysBackupRecordsParam = new SysBackupRecordsParam();
-                addParam.setBackupKey(vo.key);
+                addParam.backupKey = vo.key;
                 addParam.status = BackupRecordStatusEnum.STATUS_READY.status;
-                addParam.setContent("手动备份");
+                addParam.content = "手动备份";
                 addParam.version = this.appConfig.version;
                 add(addParam);
             }
     
-            const steps: string[] = vo.getSteps().keySet().stream();
-            const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : "";
+            const steps: string[] = vo.steps.keySet().stream();
+            const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
     
             if ((step && step.length > 0)) {
-                if (!vo.getExecuted().includes(step)) {
-                    vo.getExecuted().add(step);
+                if (!vo.executed.includes(step)) {
+                    vo.executed.add(step);
                 }
                 try {
                     const param: Record<String, Object> = null;
                     param = (Record<String, Object>) dynamicMethodCall(step, vo);
                     if (param != null) {
-                        vo.setParams(param);
+                        vo.params = param;
                     } else {
-                        vo.setStep(step);
-                        vo.setParams(null);
+                        vo.step = step;
+                        vo.params = null;
                     }
                     setBackupTaskCache(vo);
                 } catch (e) {
-                    vo.setStep(step);
-                    vo.setTask("fail");
-                    vo.setContent("备份失败，稍后请重新手动备份，失败原因：" + e.message);
+                    vo.step = step;
+                    vo.task = "fail";
+                    vo.content = "备份失败，稍后请重新手动备份，失败原因：" + e.message;
                     setBackupTaskCache(vo);
                     // 删除备份记录
                     this.sysBackupRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })));
@@ -235,10 +235,10 @@ export class SysBackupRecordsServiceImplService {
   async backupComplete(vo: BackupTaskVo): Promise<any> {
     const backupRecord: SysBackupRecords = new SysBackupRecords();
             backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
-            backupRecord.setCompleteTime(Date.now() / 1000);
+            backupRecord.completeTime = Date.now( / 1000);
             this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key));
     
-            vo.setTask("end");
+            vo.task = "end";
     
             this.sysUpgradeRecordsService.clearBackupTaskCache(5);
   }
@@ -249,7 +249,7 @@ export class SysBackupRecordsServiceImplService {
   async restoreBackupComplete(vo: BackupTaskVo): Promise<any> {
     const backupRecord: SysBackupRecords = new SysBackupRecords();
             backupRecord.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
-            backupRecord.setCompleteTime(Date.now() / 1000);
+            backupRecord.completeTime = Date.now( / 1000);
             this.sysBackupRecordsRepository.save(backupRecord, /* TODO: any /* TODO: QueryWrapper<SysBackupRecords> */需改写为TypeORM的where条件对象 */.eq("backup_key", vo.key));
   }
 
@@ -257,7 +257,7 @@ export class SysBackupRecordsServiceImplService {
    * restoreComplete
    */
   async restoreComplete(vo: BackupTaskVo): Promise<any> {
-    vo.setTask("end");
+    vo.task = "end";
             this.sysUpgradeRecordsService.clearRestoreTaskCache(5);
   }
 
@@ -265,7 +265,7 @@ export class SysBackupRecordsServiceImplService {
    * setBackupTaskCache
    */
   async setBackupTaskCache(vo: BackupTaskVo): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             cache.put("backup_task", JsonUtils.parseObject<any>(vo).toString(), 1800);
   }
 
@@ -273,7 +273,7 @@ export class SysBackupRecordsServiceImplService {
    * setBackupRestoreTaskCache
    */
   async setBackupRestoreTaskCache(vo: BackupTaskVo): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             cache.put("backup_restore_task", JsonUtils.parseObject<any>(vo).toString(), 1800);
   }
 
@@ -287,7 +287,7 @@ export class SysBackupRecordsServiceImplService {
                 } catch (e) {
                 }
             }
-            const cache: Cached = CacheFactory.getCacheOperator();
+            const cache: Cached = CacheFactory.cacheOperator;
             cache.remove("backup_task");
   }
 
@@ -301,7 +301,7 @@ export class SysBackupRecordsServiceImplService {
                 } catch (e) {
                 }
             }
-            const cache: Cached = CacheFactory.getCacheOperator();
+            const cache: Cached = CacheFactory.cacheOperator;
             cache.remove("backup_restore_task");
   }
 
@@ -309,7 +309,7 @@ export class SysBackupRecordsServiceImplService {
    * getBackupTask
    */
   async getBackupTask(): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             const data: Object = cache.get("backup_task");
             if (data == null) return null;
             return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */;
@@ -319,7 +319,7 @@ export class SysBackupRecordsServiceImplService {
    * getRestoreTask
    */
   async getRestoreTask(): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             const data: Object = cache.get("backup_restore_task");
             if (data == null) return null;
             return Object.assign(new BackupTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查BackupTaskVo构造函数 */;
@@ -405,13 +405,13 @@ export class SysBackupRecordsServiceImplService {
   async dynamicMethodCall(methodName: string, args: ): Promise<any> {
     try {
                 // 获取当前类的 Class 对象
-                Class<?> clazz = this.getClass();
+                Class<?> clazz = this.class;
                 // 获取方法对象
                 java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args));
                 // 调用方法
                 console.log("dynamicMethodCall method：" + methodName);
                 const result: Object = method.invoke(this, args);
-                if (method.getReturnType() == void.class) {
+                if (method.returnType == void.class) {
                     return null;
                 } else {
                     return result;

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-config-service-impl.service.ts

@@ -27,7 +27,7 @@ export class SysConfigServiceImplService {
    * setWebSite
    */
   async setWebSite(configParam: SysWebsiteParam): Promise<any> {
-    this.coreSysConfigService.setWebSite(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.webSite = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -48,7 +48,7 @@ export class SysConfigServiceImplService {
    * setCopyRight
    */
   async setCopyRight(configParam: SysCopyRightParam): Promise<any> {
-    this.coreSysConfigService.setCopyRight(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.copyRight = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -62,21 +62,21 @@ export class SysConfigServiceImplService {
    * setMap
    */
   async setMap(configParam: SysMapParam): Promise<any> {
-    this.coreSysConfigService.setMap(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.map = this.requestContext.siteId, configParam;
   }
 
   /**
    * getDeveloperToken
    */
   async getDeveloperToken(): Promise<any> {
-    return this.coreSysConfigService.getDeveloperToken();
+    return this.coreSysConfigService.developerToken;
   }
 
   /**
    * setDeveloperToken
    */
   async setDeveloperToken(configParam: SysDeveloperTokenParam): Promise<any> {
-    this.coreSysConfigService.setDeveloperToken(configParam);
+    this.coreSysConfigService.developerToken = configParam;
   }
 
   /**
@@ -90,7 +90,7 @@ export class SysConfigServiceImplService {
    * setLayout
    */
   async setLayout(configParam: JSONObject): Promise<any> {
-    this.coreSysConfigService.setLayout(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.layout = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -104,7 +104,7 @@ export class SysConfigServiceImplService {
    * setThemeColor
    */
   async setThemeColor(configParam: JSONObject): Promise<any> {
-    this.coreSysConfigService.setThemeColor(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.themeColor = this.requestContext.siteId, configParam;
   }
 
   /**
@@ -118,7 +118,7 @@ export class SysConfigServiceImplService {
    * setLogin
    */
   async setLogin(configParam: SysLoginConfigParam): Promise<any> {
-    this.coreSysConfigService.setLogin(this.requestContext.siteId, configParam);
+    this.coreSysConfigService.login = this.requestContext.siteId, configParam;
   }
 
   /**

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-export-service-impl.service.ts

@@ -23,10 +23,10 @@ export class SysExportServiceImplService {
     
             any /* TODO: QueryWrapper<SysExport> */ queryWrapper = new QueryWrapper();
             queryWrapper.orderByDesc("id");
-            queryWrapper.like("export_key", searchParam.getExportKey());
+            queryWrapper.like("export_key", searchParam.exportKey);
     
-            if (CommonUtils.isNotEmpty(searchParam.getExportKey())) {
-                queryWrapper.eq("export_status", searchParam.getExportStatus());
+            if (CommonUtils.isNotEmpty(searchParam.exportKey)) {
+                queryWrapper.eq("export_status", searchParam.exportStatus);
             }
     
             if (CommonUtils.isNotEmpty(searchParam.createTime)) {
@@ -49,13 +49,13 @@ export class SysExportServiceImplService {
                 const vo: SysExportListVo = new SysExportListVo();
                 Object.assign(vo, export);
                 vo.createTime = DateUtils.timestampToString(export.createTime);
-                vo.setExportStatusName(ExportEnum.getNameByCode(export.getExportStatus()));
+                vo.exportStatusName = ExportEnum.getNameByCode(export.exportStatus);
                 results
                         .map(JSONUtil::parseObj)
-                        .filter(o => o.containsKey(export.getExportKey()))
+                        .filter(o => o.containsKey(export.exportKey))
                         .findFirst()
-                        .map(o => o.getRecord<string, any>(export.getExportKey()))
-                        .ifPresent(o => vo.setExportKeyName(o.getStr("name")));
+                        .map(o => o.getRecord<string, any>(export.exportKey))
+                        .ifPresent(o => vo.exportKeyName = o.getStr("name"));
     
                 return vo;
             });
@@ -80,8 +80,8 @@ export class SysExportServiceImplService {
    */
   async checkExportData(type: string, param: Map<String, whereMap: Object>): Promise<any> {
     const pageParam: PageParam = new PageParam();
-            pageParam.setPage(number.parseInt(whereMap.getOrDefault("page", 0).toString()));
-            pageParam.setLimit(number.parseInt(whereMap.getOrDefault("limit", 0).toString()));
+            pageParam.page = number.parseInt(whereMap.getOrDefault("page", 0.toString()));
+            pageParam.limit = number.parseInt(whereMap.getOrDefault("limit", 0.toString()));
             const jsonArray: JSONArray = this.coreExportService.getExportData(this.requestContext.siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam);
             return (jsonArray && jsonArray.length > 0);
   }
@@ -92,16 +92,16 @@ export class SysExportServiceImplService {
   async exportData(type: string, param: Map<String, whereMap: Object>): Promise<any> {
     const siteId: number = this.requestContext.siteId;
             const pageParam: PageParam = new PageParam();
-            pageParam.setPage(whereMap.getOrDefault("page", 0));
-            pageParam.setLimit(whereMap.getOrDefault("limit", 0));
+            pageParam.page = whereMap.getOrDefault("page", 0);
+            pageParam.limit = whereMap.getOrDefault("limit", 0);
     
             const dataColumn: JSONArray = this.coreExportService.getExportDataColumn(type);
             const dataArray: JSONArray = this.coreExportService.getExportData(siteId, type, JsonUtils.parseObject<any>(whereMap), pageParam);
     
             const export: SysExport = new SysExport();
             export.siteId = this.requestContext.siteId;
-            export.setExportKey(type);
-            export.setExportNum(CollectionUtil.size(dataArray));
+            export.exportKey = type;
+            export.exportNum = CollectionUtil.size(dataArray);
             export.createTime = Date.now( / 1000);
             this.coreExportService.push(export);
     

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-menu-service-impl.service.ts

@@ -44,7 +44,7 @@ export class SysMenuServiceImplService {
    * add
    */
   async add(addParam: SysMenuParam): Promise<any> {
-    const sysMenu: SysMenu = this.find(addParam.getMenuKey(), addParam.appType);
+    const sysMenu: SysMenu = this.find(addParam.menuKey, addParam.appType);
             if(ObjectUtil.isNotNull(sysMenu)){
                 throw new AdminException("validate_menu.exit_menu_key");
             }
@@ -52,7 +52,7 @@ export class SysMenuServiceImplService {
             const model: SysMenu = new SysMenu();
             BeanUtil.copyProperties(addParam, model);
             model.createTime = DateUtils.currTime();
-            model.setSource(MenuSourceEnum.CREATE.getCode());
+            model.source = MenuSourceEnum.CREATE.code;
             this.sysMenuRepository.save(model);
             /** 清理缓存 */
             cached.tag(cacheTagName).clear();
@@ -181,11 +181,11 @@ export class SysMenuServiceImplService {
     
                 const menuList: SysMenu[] = this.sysMenuRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
                 for (const menu of menuList) {
-                    const langMenuKey: string = "dict_menu_" + menu.appType + "." + menu.getMenuKey();
+                    const langMenuKey: string = "dict_menu_" + menu.appType + "." + menu.menuKey;
                     const langMenuName: string = LanguageUtils.get(langMenuKey);
     
                     if (langMenuKey !== langMenuName) {
-                        menu.setMenuName(langMenuName);
+                        menu.menuName = langMenuName;
                     }
                 }
                 return menuList;

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-log-service-impl.service.ts

@@ -21,12 +21,12 @@ export class SysNoticeLogServiceImplService {
     
             any /* TODO: QueryWrapper<SysNoticeLog> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
-            if (CommonUtils.isNotEmpty(searchParam.getReceiver())) queryWrapper.eq("receiver", searchParam.getReceiver());
+            if (CommonUtils.isNotEmpty(searchParam.receiver)) queryWrapper.eq("receiver", searchParam.receiver);
             if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key);
             if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "create_time", searchParam.createTime);
             queryWrapper.orderByDesc("id");
     
-            const noticeEnum: Record<String, NoticeEnumListVo> = NoticeEnum.getNotice();
+            const noticeEnum: Record<String, NoticeEnumListVo> = NoticeEnum.notice;
     
             [SysNoticeLog[], number] iPage = this.sysNoticeLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: SysNoticeLogListVo[] = [];

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-service-impl.service.ts

@@ -53,16 +53,16 @@ export class SysNoticeServiceImplService {
     const model: SysNotice = new SysNotice();
             model.siteId = addParam.siteId;
             model.key = addParam.key;
-            model.setSmsContent(addParam.getSmsContent());
-            model.setIsWechat(addParam.getIsWechat());
-            model.setIsWeapp(addParam.getIsWeapp());
-            model.setIsSms(addParam.getIsSms());
-            model.setWechatTemplateId(addParam.getWechatTemplateId());
-            model.setWeappTemplateId(addParam.getWeappTemplateId());
-            model.setSmsId(addParam.getSmsId());
+            model.smsContent = addParam.smsContent;
+            model.isWechat = addParam.isWechat;
+            model.isWeapp = addParam.isWeapp;
+            model.isSms = addParam.isSms;
+            model.wechatTemplateId = addParam.wechatTemplateId;
+            model.weappTemplateId = addParam.weappTemplateId;
+            model.smsId = addParam.smsId;
             model.createTime = Date.now( / 1000);
-            model.setWechatFirst(addParam.getWechatFirst());
-            model.setWechatRemark(addParam.getWechatRemark());
+            model.wechatFirst = addParam.wechatFirst;
+            model.wechatRemark = addParam.wechatRemark;
             this.sysNoticeRepository.save(model);
   }
 
@@ -77,15 +77,15 @@ export class SysNoticeServiceImplService {
             model.id = id;
             model.siteId = editParam.siteId;
             model.key = editParam.key;
-            model.setSmsContent(editParam.getSmsContent());
-            model.setIsWechat(editParam.getIsWechat());
-            model.setIsWeapp(editParam.getIsWeapp());
-            model.setIsSms(editParam.getIsSms());
-            model.setWechatTemplateId(editParam.getWechatTemplateId());
-            model.setWeappTemplateId(editParam.getWeappTemplateId());
-            model.setSmsId(editParam.getSmsId());
-            model.setWechatFirst(editParam.getWechatFirst());
-            model.setWechatRemark(editParam.getWechatRemark());
+            model.smsContent = editParam.smsContent;
+            model.isWechat = editParam.isWechat;
+            model.isWeapp = editParam.isWeapp;
+            model.isSms = editParam.isSms;
+            model.wechatTemplateId = editParam.wechatTemplateId;
+            model.weappTemplateId = editParam.weappTemplateId;
+            model.smsId = editParam.smsId;
+            model.wechatFirst = editParam.wechatFirst;
+            model.wechatRemark = editParam.wechatRemark;
             sysNoticeMapper.updateById(model);
   }
 

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-notice-sms-log-service-impl.service.ts

@@ -22,20 +22,20 @@ export class SysNoticeSmsLogServiceImplService {
             any /* TODO: QueryWrapper<SysNoticeSmsLog> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
             if (CommonUtils.isNotEmpty(searchParam.key)) queryWrapper.eq("`key`", searchParam.key);
-            if (CommonUtils.isNotEmpty(searchParam.getSmsType())) queryWrapper.eq("sms_type", searchParam.getSmsType());
-            if (CommonUtils.isNotEmpty(searchParam.getMobile())) queryWrapper.eq("mobile", searchParam.getMobile());
+            if (CommonUtils.isNotEmpty(searchParam.smsType)) queryWrapper.eq("sms_type", searchParam.smsType);
+            if (CommonUtils.isNotEmpty(searchParam.mobile)) queryWrapper.eq("mobile", searchParam.mobile);
             if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper,"create_time" ,searchParam.createTime);
             queryWrapper.orderByDesc("id");
     
             const smsTypeEnum: Record<string, any> = SmsTypeEnum.type;
-            const notice: Record<String, NoticeEnumListVo> = NoticeEnum.getNotice();
+            const notice: Record<String, NoticeEnumListVo> = NoticeEnum.notice;
     
             [SysNoticeSmsLog[], number] iPage = this.sysNoticeSmsLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: SysNoticeSmsLogListVo[] = [];
             for (const item of iPageRecords) {
                 const vo: SysNoticeSmsLogListVo = new SysNoticeSmsLogListVo();
                 Object.assign(vo, item);
-                vo.setSmsTypeName(smsTypeEnum.getByPath(item.getSmsType() + ".name", String.class));
+                vo.smsTypeName = smsTypeEnum.getByPath(item.smsType + ".name", String.class);
                 vo.name = ObjectUtil.defaultIfNull(notice.get(item.key.getName(), ""));
                 list.push(vo);
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-poster-service-impl.service.ts

@@ -80,9 +80,9 @@ export class SysPosterServiceImplService {
    * add
    */
   async add(addParam: SysPosterParam): Promise<any> {
-    if (addParam.getIsDefault() === 1) {
+    if (addParam.isDefault === 1) {
                 const update: UpdateWrapper = new UpdateWrapper();
-                update.setSql("is_default = 0");
+                update.sql = "is_default = 0";
                 update.eq("type", addParam.type);
                 update.eq("is_default", 1);
                 update.eq("site_id", this.requestContext.siteId);
@@ -104,9 +104,9 @@ export class SysPosterServiceImplService {
     
             if (!model) throw new BadRequestException("海报不存在!");
     
-            if (editParam.getIsDefault() === 1) {
+            if (editParam.isDefault === 1) {
                 const update: UpdateWrapper = new UpdateWrapper();
-                update.setSql("is_default = 0");
+                update.sql = "is_default = 0";
                 update.eq("type", editParam.type);
                 update.eq("is_default", 1);
                 update.eq("site_id", this.requestContext.siteId);
@@ -144,12 +144,12 @@ export class SysPosterServiceImplService {
                 Object.assign(vo, poster);
             }
     
-            vo.setPosterType(PosterTypeEnum.getType(vo.type));
-            if (CommonUtils.isNotEmpty(vo.getPosterType()) && CommonUtils.isEmpty(vo.getAddon())) vo.setAddon(vo.getPosterType().getStr("addon", ""));
+            vo.posterType = PosterTypeEnum.getType(vo.type);
+            if (CommonUtils.isNotEmpty(vo.posterType) && CommonUtils.isEmpty(vo.addon)) vo.addon = vo.posterType.getStr("addon", "");
     
             const components: Record<string, any> = JsonModuleLoader.build().mergeResultElement("poster/components.json");
     
-            vo.setComponent(new Record<string, any>());
+            vo.component = new Record<string, any>();
             for (const key of components.keySet()) {
                 const item: Record<string, any> = components.getRecord<string, any>(key);
                 if (item.getRecord<string, any>("list") == null || item.getRecord<string, any>("list").keySet().size() == 0) {
@@ -159,7 +159,7 @@ export class SysPosterServiceImplService {
                 if (key !== vo.type && support.length > 0 &&  !support.includes(vo.type)) {
                     continue;
                 }
-                vo.getComponent().put(key, item);
+                vo.component.put(key, item);
             }
     
             return vo;
@@ -169,7 +169,7 @@ export class SysPosterServiceImplService {
    * template
    */
   async template(param: SysPosterTemplateSearchParam): Promise<any> {
-    return this.corePosterService.template(param.getAddon(), param.type);
+    return this.corePosterService.template(param.addon, param.type);
   }
 
   /**
@@ -191,14 +191,14 @@ export class SysPosterServiceImplService {
             if (!model) throw new BadRequestException("海报不存在!");
     
             const update: UpdateWrapper = new UpdateWrapper();
-            update.setSql("is_default = 0");
+            update.sql = "is_default = 0";
             update.eq("type", model.type);
             update.eq("is_default", 1);
             update.eq("site_id", this.requestContext.siteId);
             this.sysPosterRepository.save(null, update);
     
             const updateModel: SysPoster = new SysPoster();
-            updateModel.setIsDefault(1);
+            updateModel.isDefault = 1;
             updateModel.id = id;
             sysPosterMapper.updateById(updateModel);
   }
@@ -211,11 +211,11 @@ export class SysPosterServiceImplService {
             getPosterParam.id = param.id;
             getPosterParam.type = param.type;
             getPosterParam.siteId = this.requestContext.siteId;
-            getPosterParam.setChannel(ObjectUtil.defaultIfNull(param.getChannel(), "h5"));
+            getPosterParam.channel = ObjectUtil.defaultIfNull(param.channel, "h5");
             const posterParam: Record<String, Object> = {};
             posterParam.put("mode", "preview");
-            getPosterParam.setParam(posterParam);
-            getPosterParam.setIsThrowException(true);
+            getPosterParam.param = posterParam;
+            getPosterParam.isThrowException = true;
             return this.corePosterService.get(getPosterParam);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-service-impl.service.ts

@@ -29,8 +29,8 @@ export class SysPrinterServiceImplService {
             queryWrapper.eq("site_id", this.requestContext.siteId)
                     .orderByDesc("create_time");
     
-            if (CommonUtils.isNotEmpty(searchParam.getPrinterName())) {
-                queryWrapper.like("printer_name", searchParam.getPrinterName());
+            if (CommonUtils.isNotEmpty(searchParam.printerName)) {
+                queryWrapper.like("printer_name", searchParam.printerName);
             }
     
             [SysPrinter[], number] iPage = this.sysPrinterRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -38,8 +38,8 @@ export class SysPrinterServiceImplService {
             for (const item of iPageRecords) {
                 const vo: SysPrinterListVo = new SysPrinterListVo();
                 Object.assign(vo, item);
-                vo.setBrandName(SysPrinterBrandEnum.getNameByBrand(item.getBrand()));
-                vo.setTrigger(JSONArray.parseArray(item.getTrigger(), String.class));
+                vo.brandName = SysPrinterBrandEnum.getNameByBrand(item.brand);
+                vo.trigger = JSONArray.parseArray(item.trigger, String.class);
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -55,17 +55,17 @@ export class SysPrinterServiceImplService {
                     .orderByDesc("create_time")
                     .select("printer_id, apikey, brand, create_time, open_id, print_width, printer_code, printer_key, printer_name, site_id, status, template_type, 'trigger',  update_time, value");
     
-            if (CommonUtils.isNotEmpty(param.getPrinterName())) {
-                queryWrapper.like("printer_name", param.getPrinterName());
+            if (CommonUtils.isNotEmpty(param.printerName)) {
+                queryWrapper.like("printer_name", param.printerName);
             }
     
             const list: SysPrinterListVo[] = [];
             for (const item of this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) {
                 const vo: SysPrinterListVo = new SysPrinterListVo();
                 Object.assign(vo, item);
-                vo.setBrandName(SysPrinterBrandEnum.getNameByBrand(item.getBrand()));
+                vo.brandName = SysPrinterBrandEnum.getNameByBrand(item.brand);
                 vo.value = JSON.parseObject(item.value);
-                vo.setTrigger(JSONArray.parseArray(item.getTrigger(), String.class));
+                vo.trigger = JSONArray.parseArray(item.trigger, String.class);
                 list.push(vo);
             }
     
@@ -95,12 +95,12 @@ export class SysPrinterServiceImplService {
             Object.assign(model, addParam);
             model.siteId = this.requestContext.siteId;
             model.value = JSON.toJSONString(addParam.value);
-            model.setTemplateType(addParam.getTemplateType().get(0));
-            model.setTrigger(JSON.toJSONString(addParam.getTrigger()));
+            model.templateType = addParam.templateType.get(0);
+            model.trigger = JSON.toJSONString(addParam.trigger);
             model.createTime = Date.now( / 1000);
             this.sysPrinterRepository.save(model);
     
-            if (addParam.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) {
+            if (addParam.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
                 const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam();
                 Object.assign(addPrinterYlyParam, addParam);
                 this.corePrinterService.addPrinterYly(addPrinterYlyParam);
@@ -117,12 +117,12 @@ export class SysPrinterServiceImplService {
             if (!model) throw new BadRequestException("小票打印机不存在");
             Object.assign(model, editParam);
             model.value = JSON.toJSONString(editParam.value);
-            model.setTemplateType(editParam.getTemplateType().get(0));
-            model.setTrigger(JSON.toJSONString(editParam.getTrigger()));
+            model.templateType = editParam.templateType.get(0);
+            model.trigger = JSON.toJSONString(editParam.trigger);
             model.updateTime = Date.now( / 1000);
             sysPrinterMapper.updateById(model);
     
-            if (editParam.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) {
+            if (editParam.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
                 const addPrinterYlyParam: SysPrinterAddPrinterYlyParam = new SysPrinterAddPrinterYlyParam();
                 Object.assign(addPrinterYlyParam, editParam);
                 this.corePrinterService.addPrinterYly(addPrinterYlyParam);
@@ -152,7 +152,7 @@ export class SysPrinterServiceImplService {
     
             this.sysPrinterRepository.delete(id);
     
-            if (model.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) {
+            if (model.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
                 this.corePrinterService.deletePrinterYly(model);
             }
   }
@@ -163,11 +163,11 @@ export class SysPrinterServiceImplService {
   async getBrand(): Promise<any> {
     const jsonObject: Record<string, any> = new Record<string, any>();
             for (const value of SysPrinterBrandEnum.values()) {
-                if (CommonUtils.isEmpty(value.getBrand())) {
+                if (CommonUtils.isEmpty(value.brand)) {
                     continue;
                 }
     
-                jsonObject.put(value.getBrand(), path.basename(value));
+                jsonObject.put(value.brand, path.basename(value));
             }
             return jsonObject;
   }
@@ -197,7 +197,7 @@ export class SysPrinterServiceImplService {
                 throw new Error("打印机不存在");
             }
     
-            if (model.getBrand() === SysPrinterBrandEnum.YI_LIAN_YUN.getBrand()) {
+            if (model.brand === SysPrinterBrandEnum.YI_LIAN_YUN.brand) {
                 testYlyPrint(model);
             }
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-printer-template-service-impl.service.ts

@@ -25,14 +25,14 @@ export class SysPrinterTemplateServiceImplService {
             queryWrapper.eq("site_id", this.requestContext.siteId)
                     .orderByDesc("create_time");
     
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateId())) {
-                queryWrapper.eq("template_id", searchParam.getTemplateId());
+            if (CommonUtils.isNotEmpty(searchParam.templateId)) {
+                queryWrapper.eq("template_id", searchParam.templateId);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateName())) {
-                queryWrapper.like("template_name", searchParam.getTemplateName());
+            if (CommonUtils.isNotEmpty(searchParam.templateName)) {
+                queryWrapper.like("template_name", searchParam.templateName);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateType())) {
-                queryWrapper.eq("template_type", searchParam.getTemplateType());
+            if (CommonUtils.isNotEmpty(searchParam.templateType)) {
+                queryWrapper.eq("template_type", searchParam.templateType);
             }
     
             [SysPrinterTemplate[], number] iPage = this.sysPrinterTemplateRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
@@ -40,7 +40,7 @@ export class SysPrinterTemplateServiceImplService {
             for (const item of iPageRecords) {
                 const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo();
                 Object.assign(vo, item);
-                vo.setTemplateTypeName(SysPrinterTypeEnum.getTypeName(item.getTemplateType()));
+                vo.templateTypeName = SysPrinterTypeEnum.getTypeName(item.templateType);
                 vo.value = JSON.parseObject(item.value);
                 vo.createTime = DateUtils.timestampToString(item.createTime);
                 list.push(vo);
@@ -57,21 +57,21 @@ export class SysPrinterTemplateServiceImplService {
             queryWrapper.eq("site_id", this.requestContext.siteId)
                     .orderByDesc("create_time");
     
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateId())) {
-                queryWrapper.eq("template_id", searchParam.getTemplateId());
+            if (CommonUtils.isNotEmpty(searchParam.templateId)) {
+                queryWrapper.eq("template_id", searchParam.templateId);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateName())) {
-                queryWrapper.like("template_name", searchParam.getTemplateName());
+            if (CommonUtils.isNotEmpty(searchParam.templateName)) {
+                queryWrapper.like("template_name", searchParam.templateName);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getTemplateType())) {
-                queryWrapper.eq("template_type", searchParam.getTemplateType());
+            if (CommonUtils.isNotEmpty(searchParam.templateType)) {
+                queryWrapper.eq("template_type", searchParam.templateType);
             }
     
             const voList: SysPrinterTemplateListVo[] = [];
             for (const item of this.sysPrinterTemplateRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })) {
                 const vo: SysPrinterTemplateListVo = new SysPrinterTemplateListVo();
                 Object.assign(vo, item);
-                vo.setTemplateTypeName(SysPrinterTypeEnum.getTypeName(item.getTemplateType()));
+                vo.templateTypeName = SysPrinterTypeEnum.getTypeName(item.templateType);
                 vo.value = JSON.parseObject(item.value);
                 vo.createTime = DateUtils.timestampToString(item.createTime);
                 voList.push(vo);
@@ -128,7 +128,7 @@ export class SysPrinterTemplateServiceImplService {
     
             Lambdaany /* TODO: QueryWrapper<SysPrinter> */ printerLambdaQueryWrapper = new LambdaQueryWrapper();
             printerLambdaQueryWrapper.eq(SysPrinter::getSiteId, this.requestContext.siteId)
-                    .like(SysPrinter::getTemplateType, template.getTemplateType());
+                    .like(SysPrinter::getTemplateType, template.templateType);
             const printers: SysPrinter[] = this.sysPrinterRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
     
             Optional<SysPrinter> illegalPrinter = printers

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-role-service-impl.service.ts

@@ -24,8 +24,8 @@ export class SysRoleServiceImplService {
             any /* TODO: QueryWrapper<SysRole> */ queryWrapper = new QueryWrapper();
             queryWrapper.orderByDesc("role_id");
             queryWrapper.eq("site_id", this.requestContext.siteId);
-            if(ObjectUtil.isNotNull(searchParam.getRoleName()) && CommonUtils.isNotEmpty(searchParam.getRoleName())){
-                queryWrapper.like("role_name", searchParam.getRoleName());
+            if(ObjectUtil.isNotNull(searchParam.roleName) && CommonUtils.isNotEmpty(searchParam.roleName)){
+                queryWrapper.like("role_name", searchParam.roleName);
             }
             [SysRole[], number] iPage = this.sysRoleRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const list: SysRoleListVo[] = [];
@@ -56,7 +56,7 @@ export class SysRoleServiceImplService {
    */
   async add(addParam: SysRoleParam): Promise<any> {
     const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                .eq("role_name", addParam.getRoleName())
+                .eq("role_name", addParam.roleName)
                 .eq("site_id", this.requestContext.siteId)
                 .last("limit 1")
             );
@@ -64,8 +64,8 @@ export class SysRoleServiceImplService {
     
             const model: SysRole = new SysRole();
             model.siteId = this.requestContext.siteId;
-            model.setRoleName(addParam.getRoleName());
-            model.setRules(JSONUtil.toJsonStr(addParam.getRules()));
+            model.roleName = addParam.roleName;
+            model.rules = JSONUtil.toJsonStr(addParam.rules);
             model.status = addParam.status;
             model.createTime = DateUtils.currTime();
             model.updateTime = DateUtils.currTime();
@@ -77,7 +77,7 @@ export class SysRoleServiceImplService {
    */
   async edit(roleId: number, editParam: SysRoleParam): Promise<any> {
     const isExist: SysRole = this.sysRoleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                .eq("role_name", editParam.getRoleName())
+                .eq("role_name", editParam.roleName)
                 .eq("site_id", this.requestContext.siteId)
                 .ne("role_id", roleId)
                 .last("limit 1")
@@ -89,8 +89,8 @@ export class SysRoleServiceImplService {
     
             if (!model) throw new BadRequestException("数据不存在!");
             model.siteId = this.requestContext.siteId;
-            model.setRoleName(editParam.getRoleName());
-            model.setRules(JSONUtil.toJsonStr(editParam.getRules()));
+            model.roleName = editParam.roleName;
+            model.rules = JSONUtil.toJsonStr(editParam.rules);
             model.status = editParam.status;
             model.updateTime = DateUtils.currTime();
             sysRoleMapper.updateById(model);
@@ -116,7 +116,7 @@ export class SysRoleServiceImplService {
    */
   async getMenuIdsByRoleIds(siteId: number, roleIds: List<String>): Promise<any> {
     const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysRole> */需改写为TypeORM的where条件对象 */;
-            queryWrapper.eq("status", RoleStatusEnum.ON.getCode());
+            queryWrapper.eq("status", RoleStatusEnum.ON.code);
             // 判断roleIds不能为空
             if(ObjectUtil.isNotNull(roleIds) && roleIds.length>0){
                 queryWrapper.in("role_id", roleIds);
@@ -124,7 +124,7 @@ export class SysRoleServiceImplService {
             const roleList: SysRole[] = this.sysRoleRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
             const roleMenuJson: JSONArray = new JSONArray();
             for (const sysRole of roleList) {
-                const ruleJson: JSONArray = JSONUtil.parseArray(sysRole.getRules());
+                const ruleJson: JSONArray = JSONUtil.parseArray(sysRole.rules);
                 roleMenuJson.addAll(ruleJson);
             }
             //去重
@@ -155,23 +155,23 @@ export class SysRoleServiceImplService {
                 if (CommonUtils.isEmpty(sysUserRole)){
                     return List.of();
                 }
-                isAdmin = sysUserRole.getIsAdmin() == 1 ? true : false;
+                isAdmin = sysUserRole.isAdmin == 1 ? true : false;
             }
             if (!isAdmin){
-                if (StringUtils.isNotEmpty(sysUserRole.getRoleIds()) && "[]".equals(sysUserRole.getRoleIds())){
-                    const roleIdsStr: string = sysUserRole.getRoleIds().replaceAll("[\\[\\]\"]", "");
+                if (StringUtils.isNotEmpty(sysUserRole.roleIds) && "[]".equals(sysUserRole.roleIds)){
+                    const roleIdsStr: string = sysUserRole.roleIds.replaceAll("[\\[\\]\"]", "");
                     const menuIdsByRoleIds: string[] = getMenuIdsByRoleIds(this.requestContext.siteId, Arrays.stream(roleIdsStr.split(",")));
                     for (const sysRoleListVo of sysRoleListVoList) {
-                        const diff: string[] = new ArrayList<>(Collections.singleton(sysRoleListVo.getRules()));
+                        const diff: string[] = new ArrayList<>(Collections.singleton(sysRoleListVo.rules));
                         diff.removeAll(menuIdsByRoleIds);
                         if ((diff && diff.length > 0)){
-                            sysRoleListVo.setDisabled(true);
+                            sysRoleListVo.disabled = true;
                         }
                     }
                 }
     
             }
-            sysRoleListVoList.forEach(sysRoleListVo => sysRoleListVo.setRules(null));
+            sysRoleListVoList.forEach(sysRoleListVo => sysRoleListVo.rules = null);
             return sysRoleListVoList;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-schedule-service-impl.service.ts

@@ -33,8 +33,8 @@ export class SysScheduleServiceImplService {
             const providers: Record<String, IJobProvider> = applicationContext.getBeansOfType(IJobProvider.class);
             log.info("Loaded job provider count: {}", providers.length);
             for (const provider of providers.values()) {
-                log.info("Loaded job provider: {}", provider.getClass().getName());
-                const annotation: JobProvider = provider.getClass().getAnnotation(JobProvider.class);
+                log.info("Loaded job provider: {}", provider.class.getName());
+                const annotation: JobProvider = provider.class.getAnnotation(JobProvider.class);
                 if (annotation != null) {
                     // 使用注解的 key 作为 map 的键
                     jobProviderMap.put(annotation.key(), provider);
@@ -75,8 +75,8 @@ export class SysScheduleServiceImplService {
             for (const sysSchedule of sysSchedulePageRecords) {
                 const sysScheduleListVo: SysScheduleListVo = new SysScheduleListVo();
                 Object.assign(sysScheduleListVo, sysSchedule);
-                sysScheduleListVo.setTimeObject(sysSchedule.getTime());
-                sysScheduleListVo.setCrontabContent(QuartzJobManager.convertCronContent(sysSchedule.getTime()));
+                sysScheduleListVo.timeObject = sysSchedule.time;
+                sysScheduleListVo.crontabContent = QuartzJobManager.convertCronContent(sysSchedule.time);
                 sysScheduleListVoList.push(sysScheduleListVo);
             }
             return PageResult.build(page, limit, sysSchedulePageTotal).setData(sysScheduleListVoList);
@@ -129,11 +129,11 @@ export class SysScheduleServiceImplService {
             // 新增一个任务
             const newSysSchedule: SysSchedule = new SysSchedule();
             Object.assign(newSysSchedule, sysScheduleParam);
-            newSysSchedule.setTime(JSONUtil.toJsonStr(sysScheduleParam.getTime()));
+            newSysSchedule.time = JSONUtil.toJsonStr(sysScheduleParam.time);
             newSysSchedule.createTime = DateUtils.currTime();
             newSysSchedule.updateTime = DateUtils.currTime();
             newSysSchedule.siteId = this.requestContext.siteId;
-            newSysSchedule.setAddon(jobInfo.getSource());
+            newSysSchedule.addon = jobInfo.source;
             const result: number = this.sysScheduleRepository.save(newSysSchedule);
             if (result > 0) {
                 if (newSysSchedule.status == 1) {
@@ -155,7 +155,7 @@ export class SysScheduleServiceImplService {
             newSysSchedule.id = id;
             newSysSchedule.siteId = this.requestContext.siteId;
             newSysSchedule.updateTime = DateUtils.currTime();
-            newSysSchedule.setTime(JSONUtil.toJsonStr(sysScheduleParam.getTime()));
+            newSysSchedule.time = JSONUtil.toJsonStr(sysScheduleParam.time);
             const result: number = sysScheduleMapper.updateById(newSysSchedule);
             if (result <= 0) {
                 log.error("更新系统任务失败：id={}", id);
@@ -191,9 +191,9 @@ export class SysScheduleServiceImplService {
                 const sysScheduleTemplateVo: SysScheduleTemplateVo = new SysScheduleTemplateVo();
                 sysScheduleTemplateVo.key = jobKey;
                 sysScheduleTemplateVo.name = path.basename(jobInfo);
-                sysScheduleTemplateVo.desc = jobInfo.getDescribe();
-                sysScheduleTemplateVo.setClazz(jobInfo.getJobClass());
-                sysScheduleTemplateVo.setFunction(jobInfo.getJobClass());
+                sysScheduleTemplateVo.desc = jobInfo.describe;
+                sysScheduleTemplateVo.clazz = jobInfo.jobClass;
+                sysScheduleTemplateVo.function = jobInfo.jobClass;
                 sysScheduleTemplateVoList.push(sysScheduleTemplateVo);
             }
             return sysScheduleTemplateVoList;
@@ -225,13 +225,13 @@ export class SysScheduleServiceImplService {
     const page: number = pageParam.page;
             const limit: number = pageParam.limit;
             Lambdaany /* TODO: QueryWrapper<SysScheduleLog> */ qw = new LambdaQueryWrapper();
-            qw.eq(CommonUtils.isNotEmpty(searchParam.getScheduleId()), SysScheduleLog::getScheduleId, searchParam.getScheduleId());
+            qw.eq(CommonUtils.isNotEmpty(searchParam.scheduleId), SysScheduleLog::getScheduleId, searchParam.scheduleId);
             qw.eq(CommonUtils.isNotEmpty(searchParam.key), SysScheduleLog::getKey, searchParam.key);
             if (CommonUtils.isNotEmpty(searchParam.status) && !"all".equals(searchParam.status)){
                 qw.eq(SysScheduleLog::getStatus, searchParam.status);
             }
-            if (CommonUtils.isNotEmpty(searchParam.getExecuteTime())) {
-                QueryMapperUtils.buildByTime(qw, SysScheduleLog::getExecuteTime, searchParam.getExecuteTime());
+            if (CommonUtils.isNotEmpty(searchParam.executeTime)) {
+                QueryMapperUtils.buildByTime(qw, SysScheduleLog::getExecuteTime, searchParam.executeTime);
             }
             any /* TODO: Page<SysScheduleLog> */ sysScheduleLogPage = this.sysScheduleLogRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), qw);
             const result: SysScheduleLogListVo[] = [];
@@ -248,10 +248,10 @@ export class SysScheduleServiceImplService {
    */
   async addLog(log: SysScheduleLog): Promise<any> {
     const sysSchedule: SysSchedule = this.sysScheduleRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                    .eq(SysSchedule::getKey, log.key).eq(SysSchedule::getAddon, log.getAddon()));
+                    .eq(SysSchedule::getKey, log.key).eq(SysSchedule::getAddon, log.addon));
             if (sysSchedule == null) return;
-            log.setScheduleId(sysSchedule.id);
-            log.setExecuteTime(DateUtils.currTime());
+            log.scheduleId = sysSchedule.id;
+            log.executeTime = DateUtils.currTime();
             this.sysScheduleLogRepository.save(log);
   }
 
@@ -263,7 +263,7 @@ export class SysScheduleServiceImplService {
             if (sysSchedule == null) {
                 throw new BadRequestException("计划任务不存在");
             }
-            const basePackage: string = String.format("com.niu.%s.job", sysSchedule.getAddon());
+            const basePackage: string = String.format("com.niu.%s.job", sysSchedule.addon);
             const classPath: string = QuartzJobManager.getClassPath(basePackage, sysSchedule.key);
             const jobKey: string = sysSchedule.key;
             try {
@@ -276,7 +276,7 @@ export class SysScheduleServiceImplService {
                 }
     
                 // 实例化任务
-                const job: IJobProvider = (IJobProvider) jobClass.getDeclaredConstructor().newInstance();
+                const job: IJobProvider = (IJobProvider) jobClass.declaredConstructor.newInstance();
     
                 // 执行任务
                 job.exec(null);
@@ -286,7 +286,7 @@ export class SysScheduleServiceImplService {
                 addLog(SysScheduleLog.builder()
                         .key(jobKey)
                         .name(path.basename(sysSchedule))
-                        .addon(sysSchedule.getAddon())
+                        .addon(sysSchedule.addon)
                         .className(classPath)
                         .status("success")
                         .executeResult(result)
@@ -296,11 +296,11 @@ export class SysScheduleServiceImplService {
             } catch (e) {
                 // 获取任务名称（即使在异常情况下也尝试获取）
                 const errorMsg: string = "计划任务：" + path.basename(sysSchedule) + "发生错误, 错误原因：" + e.message +
-                        " at " + e.getStackTrace()[0].toString();
+                        " at " + e.stackTrace[0].toString();
                 addLog(SysScheduleLog.builder()
                         .key(jobKey)
                         .name(path.basename(sysSchedule))
-                        .addon(sysSchedule.getAddon())
+                        .addon(sysSchedule.addon)
                         .className(classPath)
                         .status("error")
                         .executeResult(errorMsg)

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-upgrade-records-service-impl.service.ts

@@ -34,17 +34,17 @@ export class SysUpgradeRecordsServiceImplService {
                 const vo: SysUpgradeRecordsListVo = new SysUpgradeRecordsListVo();
                 Object.assign(vo, item);
                 vo.createTime = DateUtils.timestampToString(item.createTime);
-                vo.setCompleteTime(DateUtils.timestampToString(item.getCompleteTime()));
-                vo.setStatusName(UpgradeRecordStatusEnum.getNameByStatus(vo.status));
+                vo.completeTime = DateUtils.timestampToString(item.completeTime);
+                vo.statusName = UpgradeRecordStatusEnum.getNameByStatus(vo.status);
                 //判断为数组或者对象或者字符串
-                const value: string = item.getContent();
+                const value: string = item.content;
                 if (!StrUtil.isEmpty(value)) {
                     if (value.startsWith("[")) {
-                        vo.setContent(JSON.parseArray(value));
+                        vo.content = JSON.parseArray(value);
                     } else if (value.startsWith("{")) {
-                        vo.setContent(JSON.parseObject(value));
+                        vo.content = JSON.parseObject(value);
                     } else {
-                        vo.setContent(value);
+                        vo.content = value;
                     }
                 }
                 list.push(vo);
@@ -77,11 +77,11 @@ export class SysUpgradeRecordsServiceImplService {
         public void del(SysUpgradeRecordsDelParam delParam) {
             const queryWrapper: QueryWrapper = /* TODO: any /* TODO: QueryWrapper<SysUpgradeRecords> */需改写为TypeORM的where条件对象 */;
     
-            if (delParam.getIds().getClass().getName().startsWith("[")) {
-                const stringIds: string[] = (String[]) delParam.getIds();
+            if (delParam.ids.getClass().getName().startsWith("[")) {
+                const stringIds: string[] = (String[]) delParam.ids;
                 queryWrapper.in("id", stringIds);
             } else {
-                queryWrapper.eq("id", delParam.getIds());
+                queryWrapper.eq("id", delParam.ids);
             }
             this.sysUpgradeRecordsRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ });
         }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-log-service-impl.service.ts

@@ -22,11 +22,11 @@ export class SysUserLogServiceImplService {
             any /* TODO: QueryWrapper<SysUserLog> */ queryWrapper = new QueryWrapper();
             queryWrapper.eq("site_id", this.requestContext.siteId);
             queryWrapper.orderByDesc("id");
-            if(ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())){
-                queryWrapper.like("username", searchParam.getUsername());
+            if(ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)){
+                queryWrapper.like("username", searchParam.username);
             }
-            if(ObjectUtil.isNotNull(searchParam.getIp()) && CommonUtils.isNotEmpty(searchParam.getIp())){
-                queryWrapper.like("ip", searchParam.getIp());
+            if(ObjectUtil.isNotNull(searchParam.ip) && CommonUtils.isNotEmpty(searchParam.ip)){
+                queryWrapper.like("ip", searchParam.ip);
             }
     
             if(ObjectUtil.isNotNull(searchParam.url) && CommonUtils.isNotEmpty(searchParam.url)){

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-role-service-impl.service.ts

@@ -29,8 +29,8 @@ export class SysUserRoleServiceImplService {
                     .leftJoin("?_sys_user nsu ON nsur.uid = nsu.uid".replace("?_", this.appConfig.tablePrefix));
     
             //查询条件判断组装
-            if (CommonUtils.isNotEmpty(searchParam.getUid())) {
-                queryWrapper.eq("nsu.uid", searchParam.getUid());
+            if (CommonUtils.isNotEmpty(searchParam.uid)) {
+                queryWrapper.eq("nsu.uid", searchParam.uid);
             }
     
             //排序
@@ -71,14 +71,14 @@ export class SysUserRoleServiceImplService {
             }
     
             const model: SysUserRole = new SysUserRole();
-            model.setUid(addParam.getUid());
+            model.uid = addParam.uid;
             model.siteId = addParam.siteId==null? this.requestContext.siteId:addParam.siteId;
-            model.setRoleIds(addParam.getRoleIds());
+            model.roleIds = addParam.roleIds;
             model.createTime = DateUtils.currTime();
-            model.setIsAdmin(addParam.getIsAdmin()==null?0:addParam.getIsAdmin());
+            model.isAdmin = addParam.isAdmin==null?0:addParam.isAdmin;
             model.status = ObjectUtil.isNull(addParam.status? StatusEnum.ON.status : addParam.status);
             if(model.status<1){
-                model.setRoleIds(addParam.getRoleIds()==null? JSONUtil.toJsonStr(new JsonArray()):addParam.getRoleIds());
+                model.roleIds = addParam.roleIds==null? JSONUtil.toJsonStr(new JsonArray():addParam.roleIds);
             }
             this.sysUserRoleRepository.save(model);
   }
@@ -91,13 +91,13 @@ export class SysUserRoleServiceImplService {
                             .eq("site_id", editParam.siteId)
                             .last("limit 1"));
             if (!model) throw new BadRequestException("数据不存在!");
-            const isAdmin: number = model.getIsAdmin();
+            const isAdmin: number = model.isAdmin;
             if(isAdmin>0){
                 //超级管理员不允许改动权限
                 throw new AdminException("ADMIN_NOT_ALLOW_EDIT_ROLE");
             }
             model.status = editParam.status;
-            model.setRoleIds(editParam.getRoleIds());
+            model.roleIds = editParam.roleIds;
             sysUserRoleMapper.updateById(model);
   }
 

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/sys-user-service-impl.service.ts

@@ -36,17 +36,17 @@ export class SysUserServiceImplService {
             any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper();
             queryWrapper.orderByDesc("uid");
     
-            if (ObjectUtil.isNotNull(searchParam.getUsername()) && CommonUtils.isNotEmpty(searchParam.getUsername())) {
-                queryWrapper.like("username", searchParam.getUsername()).or().like("real_name", searchParam.getUsername());
+            if (ObjectUtil.isNotNull(searchParam.username) && CommonUtils.isNotEmpty(searchParam.username)) {
+                queryWrapper.like("username", searchParam.username).or().like("real_name", searchParam.username);
             }
-            if (ObjectUtil.isNotNull(searchParam.getLastTime()) && CommonUtils.isNotEmpty(searchParam.getLastTime())) {
+            if (ObjectUtil.isNotNull(searchParam.lastTime) && CommonUtils.isNotEmpty(searchParam.lastTime)) {
                 const startTime: number = 0;
                 const endTime: number = 0;
-                if (ObjectUtil.isNotNull(searchParam.getLastTime()[0])) {
-                    startTime = DateUtils.StringToTimestamp(searchParam.getLastTime()[0]);
+                if (ObjectUtil.isNotNull(searchParam.lastTime[0])) {
+                    startTime = DateUtils.StringToTimestamp(searchParam.lastTime[0]);
                 }
-                if (ObjectUtil.isNotNull(searchParam.getLastTime()[1])) {
-                    endTime = DateUtils.StringToTimestamp(searchParam.getLastTime()[1]);
+                if (ObjectUtil.isNotNull(searchParam.lastTime[1])) {
+                    endTime = DateUtils.StringToTimestamp(searchParam.lastTime[1]);
                 }
                 if (startTime > 0 && endTime > 0) {
                     queryWrapper.between("last_time", startTime, endTime);
@@ -64,8 +64,8 @@ export class SysUserServiceImplService {
                 const vo: SysUserListVo = new SysUserListVo();
                 Object.assign(vo, item);
                 const siteNum: number = this.sysUserRoleRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ })).ne("site_id", RequestUtils.defaultSiteId()));
-                vo.setSiteNum(siteNum.intValue());
-                vo.setIsSuperAdmin(superAdminUid == item.getUid());
+                vo.siteNum = siteNum.intValue();
+                vo.isSuperAdmin = superAdminUid == item.uid;
                 list.push(vo);
             }
             return PageResult.build(page, limit, iPageTotal).setData(list);
@@ -89,10 +89,10 @@ export class SysUserServiceImplService {
             userRoleMPJQueryWrapper.select("sur.*, s.site_id, s.site_name, s.app_type, s.status as siteStatus, s.expire_time")
                     .setAlias("sur")
                     .leftJoin("?_site s ON sur.site_id = s.site_id".replace("?_", this.appConfig.tablePrefix));
-            userRoleMPJQueryWrapper.eq("sur.uid", vo.getUid());
+            userRoleMPJQueryWrapper.eq("sur.uid", vo.uid);
             const userSiteRoleVoList: SysUserSiteRoleVo[] = sysUserRoleMapper.selectJoinList(SysUserSiteRoleVo.class, userRoleMPJQueryWrapper);
-            vo.setIsSuperAdmin(superAdminUid == id);
-            vo.setRoles(userSiteRoleVoList);
+            vo.isSuperAdmin = superAdminUid == id;
+            vo.roles = userSiteRoleVoList;
             return vo;
   }
 
@@ -100,27 +100,27 @@ export class SysUserServiceImplService {
    * add
    */
   async add(addParam: SysUserParam): Promise<any> {
-    if (checkUserName(addParam.getUsername())) {
+    if (checkUserName(addParam.username)) {
                 throw new AdminException("该用户名已被占用，请更换");
             }
             const sysUser: SysUser = new SysUser();
             Object.assign(sysUser, addParam);
             sysUser.createTime = DateUtils.currTime();
             sysUser.updateTime = DateUtils.currTime();
-            sysUser.setPassword(PasswordEncipher.encode(addParam.getPassword()));
+            sysUser.password = PasswordEncipher.encode(addParam.password);
             this.sysUserRepository.save(sysUser);
-            const uid: number = sysUser.getUid();
+            const uid: number = sysUser.uid;
     
             //添加用户建站限制
-            const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.getCreateSiteLimit();
+            const createSiteLimitParamList: SysCreateSiteLimitParam[] = addParam.createSiteLimit;
             const addList: UserCreateSiteLimit[] = [];
             if (ObjectUtil.isNotNull(createSiteLimitParamList) && createSiteLimitParamList.length > 0) {
                 for (const sysCreateSiteLimitParam of createSiteLimitParamList) {
                     const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit();
-                    userCreateSiteLimit.setUid(uid);
-                    userCreateSiteLimit.setGroupId(sysCreateSiteLimitParam.getGroupId());
-                    userCreateSiteLimit.setMonth(sysCreateSiteLimitParam.getMonth());
-                    userCreateSiteLimit.setNum(sysCreateSiteLimitParam.getNum());
+                    userCreateSiteLimit.uid = uid;
+                    userCreateSiteLimit.groupId = sysCreateSiteLimitParam.groupId;
+                    userCreateSiteLimit.month = sysCreateSiteLimitParam.month;
+                    userCreateSiteLimit.num = sysCreateSiteLimitParam.num;
                     addList.push(userCreateSiteLimit);
                 }
                 this.userCreateSiteLimitRepository.save(addList);
@@ -142,15 +142,15 @@ export class SysUserServiceImplService {
                     isOffStatus = true;
                 }
             }
-            if (ObjectUtil.isNotNull(editParam.getHeadImg())) {
-                model.setHeadImg(editParam.getHeadImg());
+            if (ObjectUtil.isNotNull(editParam.headImg)) {
+                model.headImg = editParam.headImg;
             }
-            if (ObjectUtil.isNotNull(editParam.getRealName())) {
-                model.setRealName(editParam.getRealName());
+            if (ObjectUtil.isNotNull(editParam.realName)) {
+                model.realName = editParam.realName;
             }
             const isChangePassword: boolean = false;
-            if (ObjectUtil.isNotNull(editParam.getPassword()) && CommonUtils.isNotEmpty(editParam.getPassword())) {
-                model.setPassword(PasswordEncipher.encode(editParam.getPassword()));
+            if (ObjectUtil.isNotNull(editParam.password) && CommonUtils.isNotEmpty(editParam.password)) {
+                model.password = PasswordEncipher.encode(editParam.password);
                 isChangePassword = true;
             }
             /**
@@ -204,9 +204,9 @@ export class SysUserServiceImplService {
                             .last("limit 1"));
     
             if (!model) throw new BadRequestException("数据不存在!");
-            model.setLastTime(DateUtils.currTime());
-            model.setLastIp(IpUtils.getIpAddr(RequestUtils.handler()));
-            model.setLoginCount(model.getLoginCount() + 1);
+            model.lastTime = DateUtils.currTime();
+            model.lastIp = IpUtils.getIpAddr(RequestUtils.handler());
+            model.loginCount = model.loginCount + 1;
             sysUserMapper.updateById(model);
   }
 
@@ -216,39 +216,39 @@ export class SysUserServiceImplService {
   async addSiteUser(siteUserParam: SiteUserParam, siteId: number): Promise<any> {
     const uid: number = 0;
             try {
-                if (ObjectUtil.isNotNull(siteUserParam.getUid()) && siteUserParam.getUid() > 0) {
+                if (ObjectUtil.isNotNull(siteUserParam.uid) && siteUserParam.uid > 0) {
                     any /* TODO: QueryWrapper<SysUser> */ queryWrapper = new QueryWrapper();
-                    queryWrapper.eq("uid", siteUserParam.getUid());
+                    queryWrapper.eq("uid", siteUserParam.uid);
                     const sysUser: SysUser = this.sysUserRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
-                    uid = siteUserParam.getUid();
+                    uid = siteUserParam.uid;
                     if (ObjectUtil.isNull(sysUser)) {
                         throw new AdminException("USER_NOT_EXIST");
                     }
                 } else {
                     const sysUserParam: SysUserParam = new SysUserParam();
-                    sysUserParam.setHeadImg(siteUserParam.getHeadImg());
-                    sysUserParam.setPassword(siteUserParam.getPassword());
-                    sysUserParam.setLastIp("");
-                    sysUserParam.setLoginCount(0);
-                    sysUserParam.setUsername(siteUserParam.getUsername());
-                    sysUserParam.setIsDel(0);
-                    sysUserParam.setLastTime(DateUtils.currTime());
+                    sysUserParam.headImg = siteUserParam.headImg;
+                    sysUserParam.password = siteUserParam.password;
+                    sysUserParam.lastIp = "";
+                    sysUserParam.loginCount = 0;
+                    sysUserParam.username = siteUserParam.username;
+                    sysUserParam.isDel = 0;
+                    sysUserParam.lastTime = DateUtils.currTime();
                     sysUserParam.status = siteUserParam.status;
-                    sysUserParam.setRealName(siteUserParam.getRealName());
+                    sysUserParam.realName = siteUserParam.realName;
                     //添加用户
                     uid = this.push(sysUserParam);
                 }
-                const roleIds: string[] = siteUserParam.getRoleIds();
-                const isAdmin: number = siteUserParam.getIsAdmin() == null ? 0 : siteUserParam.getIsAdmin();
+                const roleIds: string[] = siteUserParam.roleIds;
+                const isAdmin: number = siteUserParam.isAdmin == null ? 0 : siteUserParam.isAdmin;
                 /**
                  * 创建用户站点管理权限
                  */
                 const sysUserRoleParam: SysUserRoleParam = new SysUserRoleParam();
-                sysUserRoleParam.setRoleIds(JSONUtil.toJsonStr(roleIds));
+                sysUserRoleParam.roleIds = JSONUtil.toJsonStr(roleIds);
                 sysUserRoleParam.siteId = siteId;
-                sysUserRoleParam.setUid(uid);
+                sysUserRoleParam.uid = uid;
                 sysUserRoleParam.status = siteUserParam.status;
-                sysUserRoleParam.setIsAdmin(isAdmin);
+                sysUserRoleParam.isAdmin = isAdmin;
                 this.sysUserRoleService.push(sysUserRoleParam);
             } catch (e) {
                 throw new AdminException(e.message);
@@ -308,12 +308,12 @@ export class SysUserServiceImplService {
    * addUserCreateSiteLimit
    */
   async addUserCreateSiteLimit(userCreateSiteLimitAddParam: SysUserCreateSiteLimitAddParam): Promise<any> {
-    this.userCreateSiteLimitRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", userCreateSiteLimitAddParam.getGroupId()));
+    this.userCreateSiteLimitRepository.delete({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("group_id", userCreateSiteLimitAddParam.groupId));
             const userCreateSiteLimit: UserCreateSiteLimit = new UserCreateSiteLimit();
-            userCreateSiteLimit.setNum(userCreateSiteLimitAddParam.getNum());
-            userCreateSiteLimit.setUid(userCreateSiteLimitAddParam.getUid());
-            userCreateSiteLimit.setMonth(userCreateSiteLimitAddParam.getMonth());
-            userCreateSiteLimit.setGroupId(userCreateSiteLimitAddParam.getGroupId());
+            userCreateSiteLimit.num = userCreateSiteLimitAddParam.num;
+            userCreateSiteLimit.uid = userCreateSiteLimitAddParam.uid;
+            userCreateSiteLimit.month = userCreateSiteLimitAddParam.month;
+            userCreateSiteLimit.groupId = userCreateSiteLimitAddParam.groupId;
             this.userCreateSiteLimitRepository.save(userCreateSiteLimit);
   }
 
@@ -322,8 +322,8 @@ export class SysUserServiceImplService {
    */
   async editUserCreateSiteLimit(userCreateSiteLimitEditParam: SysUserCreateSiteLimitEditParam): Promise<any> {
     const userCreateSiteLimit: UserCreateSiteLimit = userCreateSiteLimitMapper.selectById(userCreateSiteLimitEditParam.id);
-            userCreateSiteLimit.setNum(userCreateSiteLimitEditParam.getNum());
-            userCreateSiteLimit.setMonth(userCreateSiteLimitEditParam.getMonth());
+            userCreateSiteLimit.num = userCreateSiteLimitEditParam.num;
+            userCreateSiteLimit.month = userCreateSiteLimitEditParam.month;
             userCreateSiteLimitMapper.updateById(userCreateSiteLimit);
   }
 
@@ -349,7 +349,7 @@ export class SysUserServiceImplService {
   async getUserSelect(username: string): Promise<any> {
     // 1. 构建查询条件
             MPJany /* TODO: QueryWrapper<SysUser> */ qw = new MPJQueryWrapper();
-            qw.setAlias("u")
+            qw.alias = "u"
                     .leftJoin("?_sys_user_role ur on u.uid = ur.uid".replace("?_", this.appConfig.tablePrefix))
                     .select("u.uid, u.username, u.head_img")
                     .and(wrapper => wrapper.eq("ur.is_admin", 1))
@@ -359,7 +359,7 @@ export class SysUserServiceImplService {
             // 2. 获取并过滤用户
             const userAll: SysUser[] = StringUtils.isNotEmpty(username)
                     ? getUserAll().stream()
-                    .filter(item => item.getUsername() === username)
+                    .filter(item => item.username === username)
                     
                     : getUserAll();
     
@@ -396,12 +396,12 @@ export class SysUserServiceImplService {
             adminUsers.forEach(user => {
                 const vo: SysUserInfoVo = new SysUserInfoVo();
                 Object.assign(vo, user);
-                resultMap.put(user.getUid(), vo);
+                resultMap.put(user.uid, vo);
             });
             noRoleUsers.forEach(user => {
                 const vo: SysUserInfoVo = new SysUserInfoVo();
                 Object.assign(vo, user);
-                resultMap.put(user.getUid(), vo);
+                resultMap.put(user.uid, vo);
             });
     
             return new ArrayList<>(resultMap.values());

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/sys/impl/system-service-impl.service.ts

@@ -17,13 +17,13 @@ export class SystemServiceImplService {
    */
   async getInfo(): Promise<any> {
     const statSystemVo: StatSystemVo = new StatSystemVo();
-            statSystemVo.setOs(System.getProperty("os.name", "Linux"));
-            statSystemVo.setEnvironment(System.getProperty("catalina.home"));
-            statSystemVo.setPhpV(System.getProperty("java.version"));
+            statSystemVo.os = System.getProperty("os.name", "Linux");
+            statSystemVo.environment = System.getProperty("catalina.home");
+            statSystemVo.phpV = System.getProperty("java.version");
     
             const statVersionVo: StatVersionVo = new StatVersionVo();
             statVersionVo.version = "202406150001";
-            statVersionVo.setCode("0.4.0");
+            statVersionVo.code = "0.4.0";
     
             statSystemVo.version = statVersionVo;
             return statSystemVo;
@@ -33,7 +33,7 @@ export class SystemServiceImplService {
    * clearCache
    */
   async clearCache(): Promise<any> {
-    cached.getAllKeys().stream().forEach(key => cached.remove(key));
+    cached.allKeys.stream().forEach(key => cached.remove(key));
   }
 
   /**
@@ -44,13 +44,13 @@ export class SystemServiceImplService {
     
             try {
                 const data: Record<String, Object> = {};
-                for (SpreadQrcodeParam.Param qrcodeParam : param.getParams()) {
+                for (SpreadQrcodeParam.Param qrcodeParam : param.params) {
                     const jsonArray: JSONArray = JSONUtil.parseArray(qrcodeParam);
                     const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(jsonArray);
-                    data.put(jsonObject.getStr("name"), qrcodeParam.getColumnValue());
+                    data.put(jsonObject.getStr("name"), qrcodeParam.columnValue);
                 }
-                const dir: string = "upload/qrcode/" + this.requestContext.siteId + "/" + param.getFolder();
-                vo.setWeappPath(QrcodeUtils.qrcodeToFile(this.requestContext.siteId, "weapp", "", param.page, data, dir));
+                const dir: string = "upload/qrcode/" + this.requestContext.siteId + "/" + param.folder;
+                vo.weappPath = QrcodeUtils.qrcodeToFile(this.requestContext.siteId, "weapp", "", param.page, data, dir);
             } catch (e) {
     
             }
@@ -61,9 +61,9 @@ export class SystemServiceImplService {
    * getDatabaseVersion
    */
   async getDatabaseVersion(): Promise<any> {
-    try (const connection: Connection = dataSource.getConnection()) {
-                const metaData: DatabaseMetaData = connection.getMetaData();
-                return metaData.getDatabaseProductVersion();
+    try (const connection: Connection = dataSource.connection) {
+                const metaData: DatabaseMetaData = connection.metaData;
+                return metaData.databaseProductVersion;
             }catch (e) {
                 return "未知";
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upgrade/impl/upgrade-service-impl.service.ts

@@ -85,14 +85,14 @@ export class UpgradeServiceImplService {
    * getUpgradeContent
    */
   async getUpgradeContent(addon: string): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
             const vo: UpgradeContentVo = new UpgradeContentVo();
     
             const apps: Map[] = [];
     
             if ((!addon || addon.length === 0)) {
                 const query: Record<String, Object> = {};
-                query.put("product_key", instance.getProductKey());
+                query.put("product_key", instance.productKey);
                 query.put("app_key", this.appConfig.appKey);
                 query.put("version", this.appConfig.version);
                 apps.push(query);
@@ -100,7 +100,7 @@ export class UpgradeServiceImplService {
                 for (const key of addon.split(",")) {
                     const addonModel: Addon = this.addonRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).select("version,type"));
                     const query: Record<String, Object> = {};
-                    query.put("product_key", instance.getProductKey());
+                    query.put("product_key", instance.productKey);
                     query.put("app_key", key);
                     query.put("version", addonModel.version);
                     if (addonModel.type === AddonTypeEnum.APP.type) {
@@ -115,12 +115,12 @@ export class UpgradeServiceImplService {
                 const content: Record<string, any> = NiucloudUtils.Niucloud.get("member_app_upgrade/content", item).getRecord<string, any>("data");
                 if (content != null) {
                     UpgradeContentVo.const contentVo: Content = JSONUtil.toBean(content, UpgradeContentVo.Content.class);
-                    vo.getContent().add(contentVo);
-                    vo.getUpgradeApps().add(contentVo.getApp().getAppKey());
+                    vo.content.add(contentVo);
+                    vo.upgradeApps.add(contentVo.app.getAppKey());
                 }
             }
     
-            vo.setLastBackup(this.sysBackupRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
+            vo.lastBackup = this.sysBackupRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }
                 .orderByDesc("complete_time")
                 .last("limit 1")
             ));
@@ -135,24 +135,24 @@ export class UpgradeServiceImplService {
     if (this.appConfig.runActive === "dev") throw new BadRequestException("开发环境下请先关闭服务启动webroot/jar下的web-app-boot-exec进行升级");
             if (getUpgradeTask() != null) throw new BadRequestException("已经有正在升级中的任务");
     
-            const upgradeContent: UpgradeContentVo = getUpgradeContent(upgradeParam.getAddon());
-            upgradeContent.setContent(upgradeContent.getContent().stream().filter(c => c.getVersionList().size() > 0));
-            upgradeContent.setUpgradeApps(upgradeContent.getContent().stream().map(c => c.getApp().getAppKey()));
-            if (upgradeContent.getContent().size() == 0) throw new BadRequestException("没有获取到可以升级的内容");
+            const upgradeContent: UpgradeContentVo = getUpgradeContent(upgradeParam.addon);
+            upgradeContent.content = upgradeContent.content.stream(.filter(c => c.versionList.size() > 0));
+            upgradeContent.upgradeApps = upgradeContent.content.stream(.map(c => c.app.getAppKey()));
+            if (upgradeContent.content.size() == 0) throw new BadRequestException("没有获取到可以升级的内容");
     
-            const instance: NiucloudUtils = NiucloudUtils.getInstance();
+            const instance: NiucloudUtils = NiucloudUtils.instance;
     
             // 获取下载token
             const actionQuery: Record<String, Object> = new const query: Record<>();
-            actionQuery.put("data[product_key]", instance.getProductKey());
+            actionQuery.put("data[product_key]", instance.productKey);
             actionQuery.put("data[framework_version]", this.appConfig.version);
-            actionQuery.put("data[app_key]", upgradeContent.getContent().get(0).getApp().getAppKey());
-            actionQuery.put("data[version]", upgradeContent.getContent().get(0).getVersion());
+            actionQuery.put("data[app_key]", upgradeContent.content.get(0).getApp().getAppKey());
+            actionQuery.put("data[version]", upgradeContent.content.get(0).getVersion());
     
             const actionToken: Record<string, any> = this.niucloudService.getActionToken("upgrade", actionQuery);
     
             Record<String, Object> = {};
-            query.put("authorize_code", instance.getCode());
+            query.put("authorize_code", instance.code);
             query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
             const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/upgrade").query(query).method(Method.GET).execute();
     
@@ -162,40 +162,40 @@ export class UpgradeServiceImplService {
             if (body.getInt("code").equals(0)) throw new Error(body.getStr("msg"));
     
             const vo: UpgradeTaskVo = new UpgradeTaskVo();
-            vo.setEnvType(this.appConfig.envType);
-            vo.setUpgradeTime(DateUtil.now());
-            vo.setAddon(actionQuery.get("data[app_key]"));
+            vo.envType = this.appConfig.envType;
+            vo.upgradeTime = DateUtil.now();
+            vo.addon = actionQuery.get("data[app_key]");
             vo.key = RandomUtil.randomString(10);
-            vo.setUpgrade(actionQuery);
-            vo.setStep("requestUpgrade");
-            vo.getExecuted().add("requestUpgrade");
-            vo.getLog().add(vo.getSteps().get("requestUpgrade").getTitle());
-            vo.setParams(query);
-            vo.setUpgradeContent(upgradeContent);
+            vo.upgrade = actionQuery;
+            vo.step = "requestUpgrade";
+            vo.executed.add("requestUpgrade");
+            vo.log.add(vo.steps.get("requestUpgrade").getTitle());
+            vo.params = query;
+            vo.upgradeContent = upgradeContent;
     
-            if (!upgradeParam.getIsNeedBackup()) {
-                vo.getSteps().remove("backupCode");
-                vo.getSteps().remove("backupSql");
+            if (!upgradeParam.isNeedBackup) {
+                vo.steps.remove("backupCode");
+                vo.steps.remove("backupSql");
             }
-            if (!upgradeParam.getIsNeedCloudbuild()) {
-                vo.getSteps().remove("cloudBuild");
-                vo.getSteps().remove("gteCloudBuildLog");
+            if (!upgradeParam.isNeedCloudbuild) {
+                vo.steps.remove("cloudBuild");
+                vo.steps.remove("gteCloudBuildLog");
             }
     
             // 添加升级记录
             const content: JSONArray = new JSONArray();
-            upgradeContent.getContent().stream().forEach(i => {
+            upgradeContent.content.stream().forEach(i => {
                 const item: Record<string, any> = new Record<string, any>();
-                item.set("app_key", i.getApp().getAppKey());
-                item.putByPath("app.name", i.getApp().getAppName());
+                item.set("app_key", i.app.getAppKey());
+                item.putByPath("app.name", i.app.getAppName());
                 item.set("version", i.version);
-                item.set("upgrade_version", i.getUpgradeVersion());
+                item.set("upgrade_version", i.upgradeVersion);
                 content.put(item);
             });
             const record: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
-            record.setUpgradeKey(vo.key);
+            record.upgradeKey = vo.key;
             record.status = UpgradeRecordStatusEnum.STATUS_READY.status;
-            record.setContent(content.toString());
+            record.content = content.toString();
             this.sysUpgradeRecordsService.push(record);
     
             setUpgradeTaskCache(vo);
@@ -206,7 +206,7 @@ export class UpgradeServiceImplService {
    * getUpgradeTask
    */
   async getUpgradeTask(): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             const data: Object = cache.get("upgrade");
             if (data == null) return null;
             return Object.assign(new UpgradeTaskVo(), JsonUtils.parseObject<any>(data)) /* TODO: 检查UpgradeTaskVo构造函数 */;
@@ -216,7 +216,7 @@ export class UpgradeServiceImplService {
    * setUpgradeTaskCache
    */
   async setUpgradeTaskCache(vo: UpgradeTaskVo): Promise<any> {
-    const cache: Cached = CacheFactory.getCacheOperator();
+    const cache: Cached = CacheFactory.cacheOperator;
             cache.put("upgrade", JsonUtils.parseObject<any>(vo).toString());
   }
 
@@ -230,7 +230,7 @@ export class UpgradeServiceImplService {
                 } catch (e) {
                 }
             }
-            const cache: Cached = CacheFactory.getCacheOperator();
+            const cache: Cached = CacheFactory.cacheOperator;
             cache.remove("upgrade");
   }
 
@@ -238,36 +238,36 @@ export class UpgradeServiceImplService {
    * execute
    */
   async execute(): Promise<any> {
-    const vo: UpgradeTaskVo = this.getUpgradeTask();
+    const vo: UpgradeTaskVo = this.upgradeTask;
             if (vo == null) return;
     
             if (CommonUtils.isNotEmpty(vo.status) && vo.status === "restarting") return;
     
-            const steps: string[] = vo.getSteps().keySet().stream();
-            const step: string = steps.indexOf(vo.getStep()) < steps.length - 1 ? steps.get(steps.indexOf(vo.getStep()) + 1) : "";
+            const steps: string[] = vo.steps.keySet().stream();
+            const step: string = steps.indexOf(vo.step) < steps.length - 1 ? steps.get(steps.indexOf(vo.step) + 1) : "";
     
             if ((step && step.length > 0)) {
-                if (!vo.getExecuted().includes(step)) {
-                    vo.getExecuted().add(step);
-                    vo.getLog().add(vo.getSteps().get(step).getTitle());
+                if (!vo.executed.includes(step)) {
+                    vo.executed.add(step);
+                    vo.log.add(vo.steps.get(step).getTitle());
                 }
                 try {
                     const param: Record<String, Object> = null;
                     param = (Record<String, Object>) dynamicMethodCall(step, vo);
                     if (param != null) {
-                        vo.setParams(param);
+                        vo.params = param;
                     } else {
-                        vo.setStep(step);
-                        vo.setParams(null);
-                        vo.setAddon(vo.getUpgradeApps().get(0));
+                        vo.step = step;
+                        vo.params = null;
+                        vo.addon = vo.upgradeApps.get(0);
                     }
                     setUpgradeTaskCache(vo);
                 } catch (e) {
                     if (e.message.includes("队列")) {
                         throw e;
                     } else {
-                        vo.setStep(step);
-                        vo.getError().add(e.message);
+                        vo.step = step;
+                        vo.error.add(e.message);
                         setUpgradeTaskCache(vo);
                         this.upgradeErrorHandle(vo);
                         console.error(e);
@@ -282,13 +282,13 @@ export class UpgradeServiceImplService {
    */
   async coverCode(vo: UpgradeTaskVo): Promise<any> {
     if (this.appConfig.envType === "dev") {
-                vo.getUpgradeContent().getContent().forEach(item => {
-                    const appKey: string = item.getApp().getAppKey();
+                vo.upgradeContent.getContent().forEach(item => {
+                    const appKey: string = item.app.getAppKey();
                     const codeDir: string = upgradeDir(vo + "/download/" + appKey);
     
                     // 判断目录存在并且不为空
                     if (fs.existsSync(codeDir) && fs.readdirSync(codeDir).length > 0) {
-                        item.getVersionList().stream().collect(/* Collectors已删除 */.collectingAndThen(
+                        item.versionList.stream().collect(/* Collectors已删除 */.collectingAndThen(
                             ,
                             l => {
                                 Collections.reverse(l);
@@ -322,7 +322,7 @@ export class UpgradeServiceImplService {
                                 }
                             }
     
-                            const changeDir: string = codeDir,  version.getVersionNo();
+                            const changeDir: string = codeDir,  version.versionNo;
                             if (fs.existsSync(changeDir)) {
                                 try {
                                     FileUtils.copyDirectory(changeDir, rootDir);
@@ -352,11 +352,11 @@ export class UpgradeServiceImplService {
                 vo.status = "restarting";
                 setUpgradeTaskCache(vo);
             } else {
-                vo.setStep("coverCode");
+                vo.step = "coverCode";
                 vo.status = "restarting";
                 setUpgradeTaskCache(vo);
-                fs.writeFileSync(upgradeDir(vo, "upgrade.json"), JsonUtils.parseObject<any>(vo.getUpgradeContent()).toString(), "UTF-8");
-                PipeNameUtils.noticeBootRestartByUpgrade(this.appConfig.applicationName, vo.key, vo.getUpgradeContent().getLastBackup().getBackupKey());
+                fs.writeFileSync(upgradeDir(vo, "upgrade.json"), JsonUtils.parseObject<any>(vo.upgradeContent).toString(), "UTF-8");
+                PipeNameUtils.noticeBootRestartByUpgrade(this.appConfig.applicationName, vo.key, vo.upgradeContent.getLastBackup().getBackupKey());
                 Thread.sleep(3000);
             }
   }
@@ -367,7 +367,7 @@ export class UpgradeServiceImplService {
   async handleVue(vo: UpgradeTaskVo): Promise<any> {
     const envs: WebAppEnvs = this.appConfig;
     
-            for (const key of vo.getUpgradeApps()) {
+            for (const key of vo.upgradeApps) {
                 if (key !== this.appConfig.appKey) {
                     const sourceDir: string = envs.webRootDownAddon + key;
                     if (fs.existsSync(sourceDir)) {
@@ -378,7 +378,7 @@ export class UpgradeServiceImplService {
     
             const addons: string[] = this.addonRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ })
                     .select("`key`")
-                    .eq("status", AddonStatusEnum.ON.getCode()))
+                    .eq("status", AddonStatusEnum.ON.code))
                 .stream().map(i => i.key)
                 ;
     
@@ -392,7 +392,7 @@ export class UpgradeServiceImplService {
     
             // 处理语言包
             for (const addon of addons) {
-                addonInstallTools.setAddon(addon);
+                addonInstallTools.addon = addon;
                 if (fs.existsSync(envs.webRoot + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRoot + "/uni-app/", "install");
                 if (fs.existsSync(envs.webRootDownRuntime + "uni-app/")) addonInstallTools.mergeUniappLocale(envs.webRootDownRuntime + "/uni-app/", "install");
     
@@ -413,7 +413,7 @@ export class UpgradeServiceImplService {
   async upgradeComplete(vo: UpgradeTaskVo): Promise<any> {
     vo.status = "success";
     
-            for (const key of vo.getUpgradeApps()) {
+            for (const key of vo.upgradeApps) {
                 if (key !== this.appConfig.appKey) {
                     const addon: Addon = Object.assign(new Addon(), this.coreAddonService.getAddonConfig(key)) /* TODO: 检查Addon构造函数 */;
                     this.coreAddonService.set(addon);
@@ -426,7 +426,7 @@ export class UpgradeServiceImplService {
             // 变更升级记录
             const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
             editParam.status = UpgradeRecordStatusEnum.STATUS_COMPLETE.status;
-            editParam.setCompleteTime(Date.now() / 1000);
+            editParam.completeTime = Date.now( / 1000);
             this.sysUpgradeRecordsService.edit(vo.key, editParam);
     
             this.upgradeService.clearUpgradeTask(5);
@@ -441,25 +441,25 @@ export class UpgradeServiceImplService {
     LinkedHashMap<String, UpgradeTaskVo.Step> steps = new LinkedHashMap();
             steps.put("rollback", new UpgradeTaskVo.Step("rollback", "升级失败开始回滚"));
     
-            if (vo.getExecuted().includes("coverCode")) {
+            if (vo.executed.includes("coverCode")) {
                 steps.put("restoreCover", new UpgradeTaskVo.Step("restoreCover", "恢复变更文件"));
             }
-            if (vo.getExecuted().includes("handleUpgrade")) {
+            if (vo.executed.includes("handleUpgrade")) {
                 steps.put("restoreDatabase", new UpgradeTaskVo.Step("restoreDatabase", "恢复数据库"));
             }
             steps.put("restoreComplete", new UpgradeTaskVo.Step("restoreComplete", "回滚完成"));
     
-            vo.setSteps(steps);
-            vo.setStep("rollback");
-            vo.getLog().add(steps.get("rollback").getTitle());
-            vo.getExecuted().add("rollback");
+            vo.steps = steps;
+            vo.step = "rollback";
+            vo.log.add(steps.get("rollback").getTitle());
+            vo.executed.add("rollback");
     
             setUpgradeTaskCache(vo);
     
             // 变更升级记录
             const editParam: SysUpgradeRecordsParam = new SysUpgradeRecordsParam();
             editParam.status = UpgradeRecordStatusEnum.STATUS_FAIL.status;
-            editParam.setFailReason(JSONUtil.toJsonPrettyStr(vo.getError()));
+            editParam.failReason = JSONUtil.toJsonPrettyStr(vo.error);
             this.sysUpgradeRecordsService.edit(vo.key, editParam);
   }
 
@@ -467,16 +467,16 @@ export class UpgradeServiceImplService {
    * operate
    */
   async operate(operate: string): Promise<any> {
-    const vo: UpgradeTaskVo = this.getUpgradeTask();
+    const vo: UpgradeTaskVo = this.upgradeTask;
             if (vo == null) return;
     
             switch (operate) {
                 case "local":
-                    vo.setStep("gteCloudBuildLog");
+                    vo.step = "gteCloudBuildLog";
                     setUpgradeTaskCache(vo);
                     break;
                 case "rollback":
-                    vo.getError().add("失败原因：一键云编译队列任务过多");
+                    vo.error.add("失败原因：一键云编译队列任务过多");
                     upgradeErrorHandle(vo);
                     break;
             }
@@ -496,13 +496,13 @@ export class UpgradeServiceImplService {
   async dynamicMethodCall(methodName: string, args: ): Promise<any> {
     try {
                 // 获取当前类的 Class 对象
-                Class<?> clazz = this.getClass();
+                Class<?> clazz = this.class;
                 // 获取方法对象
                 java.lang.reflect.const method: Method = clazz.getMethod(methodName, extractParameterTypes(args));
                 // 调用方法
                 console.log("dynamicMethodCall method：" + methodName);
                 const result: Object = method.invoke(this, args);
-                if (method.getReturnType() == void.class) {
+                if (method.returnType == void.class) {
                     return null;
                 } else {
                     return result;

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/upload/impl/storage-config-service-impl.service.ts

@@ -33,10 +33,10 @@ export class StorageConfigServiceImplService {
     
             const storageValues: Record<string, any> = JsonUtils.parseObject<any>(storageTypeList.get(storageType));
             const coreStorAgeConfigVo: CoreStorAgeConfigVo = new CoreStorAgeConfigVo();
-            coreStorAgeConfigVo.setStorageType(storageType);
-            coreStorAgeConfigVo.setIsUse(storageType === storageConfig.get("default") ? StorageEnum.ON.getCode() : StorageEnum.OFF.getCode());
+            coreStorAgeConfigVo.storageType = storageType;
+            coreStorAgeConfigVo.isUse = storageType === storageConfig.get("default" ? StorageEnum.ON.code : StorageEnum.OFF.code);
             coreStorAgeConfigVo.name = storageValues.get("name".toString());
-            coreStorAgeConfigVo.setComponent(storageValues.get("component").toString());
+            coreStorAgeConfigVo.component = storageValues.get("component".toString());
     
             const encryptParams: JSONArray = ObjectUtil.defaultIfNull(storageValues.getJSONArray("encrypt_params"), new JSONArray());
     
@@ -59,7 +59,7 @@ export class StorageConfigServiceImplService {
                     params.set(paramsKey, itemParam);
                 }
             }
-            coreStorAgeConfigVo.setParams(params);
+            coreStorAgeConfigVo.params = params;
             return coreStorAgeConfigVo;
   }
 
@@ -71,7 +71,7 @@ export class StorageConfigServiceImplService {
             if (ObjectUtil.isNull(storageTypeList.get(storageType))) {
                 throw new AdminException("云存储类型不存在");
             }
-            if (storageType !== FileEnum.LOCAL.getCode()) {
+            if (storageType !== FileEnum.LOCAL.code) {
                 const domain: string = storageData.getStr("domain");
                 if (domain.indexOf("http://") < 0 && domain.indexOf("https://") < 0) {
                     throw new AdminException("空间域名请补全http://或https://");
@@ -108,6 +108,6 @@ export class StorageConfigServiceImplService {
     
             storageConfig.set(storageType, configParams);
     
-            this.coreConfigService.setConfig(this.requestContext.siteId, "STORAGE", storageConfig);
+            this.coreConfigService.config = this.requestContext.siteId, "STORAGE", storageConfig;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verifier-service-impl.service.ts

@@ -22,7 +22,7 @@ export class VerifierServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("v").innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "v".innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("v.site_id", this.requestContext.siteId);
             queryWrapper.orderByDesc("id");
@@ -35,7 +35,7 @@ export class VerifierServiceImplService {
     
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
-                vo.setMember(memberInfoVo);
+                vo.member = memberInfoVo;
     
                 list.push(vo);
             }
@@ -47,7 +47,7 @@ export class VerifierServiceImplService {
    */
   async all(): Promise<any> {
     MPJany /* TODO: QueryWrapper<Verifier> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("v").innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "v".innerJoin("?_member m ON v.member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("v.site_id", this.requestContext.siteId);
             queryWrapper.orderByDesc("id");
@@ -61,7 +61,7 @@ export class VerifierServiceImplService {
     
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
-                vo.setMember(memberInfoVo);
+                vo.member = memberInfoVo;
     
                 list.push(vo);
             }
@@ -82,7 +82,7 @@ export class VerifierServiceImplService {
             model.siteId = this.requestContext.siteId;
             model.memberId = addParam.memberId;
             model.createTime = Date.now( / 1000);
-            model.setVerifyType(JSONUtil.parseArray(addParam.getVerifyType()).toString());
+            model.verifyType = JSONUtil.parseArray(addParam.verifyType.toString());
     
             this.verifierRepository.save(model);
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/verify/impl/verify-service-impl.service.ts

@@ -21,17 +21,17 @@ export class VerifyServiceImplService {
             const limit: number = pageParam.limit;
     
             MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("v").innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "v".innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("v.site_id", this.requestContext.siteId);
             queryWrapper.orderByDesc("id");
     
-            if (CommonUtils.isNotEmpty(searchParam.getCode())) queryWrapper.eq("code", searchParam.getCode());
+            if (CommonUtils.isNotEmpty(searchParam.code)) queryWrapper.eq("code", searchParam.code);
             if (CommonUtils.isNotEmpty(searchParam.type)) queryWrapper.eq("type", searchParam.type);
-            if (CommonUtils.isNotEmpty(searchParam.getVerifierMemberId())) queryWrapper.eq("verifier_member_id", searchParam.getVerifierMemberId());
+            if (CommonUtils.isNotEmpty(searchParam.verifierMemberId)) queryWrapper.eq("verifier_member_id", searchParam.verifierMemberId);
             if (CommonUtils.isNotEmpty(searchParam.createTime)) QueryMapperUtils.buildByTime(queryWrapper, "v.create_time", searchParam.createTime);
-            if (CommonUtils.isNotEmpty(searchParam.getOrderId())){
-                queryWrapper.like("data", searchParam.getOrderId());
+            if (CommonUtils.isNotEmpty(searchParam.orderId)){
+                queryWrapper.like("data", searchParam.orderId);
             }
     
             [VerifyVo[], number] iPage = verifyMapper.selectJoinPage(new Page<>(page, limit), VerifyVo.class, queryWrapper);
@@ -42,7 +42,7 @@ export class VerifyServiceImplService {
     
                 const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
                 Object.assign(memberInfoVo, item);
-                vo.setMember(memberInfoVo);
+                vo.member = memberInfoVo;
     
                 list.push(vo);
             }
@@ -54,7 +54,7 @@ export class VerifyServiceImplService {
    */
   async detail(code: string): Promise<any> {
     MPJany /* TODO: QueryWrapper<Verify> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("v").innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
+            queryWrapper.alias = "v".innerJoin("?_member m ON v.verifier_member_id = m.member_id".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("v.*,m.member_no,m.username,m.nickname,m.mobile,m.headimg");
             queryWrapper.eq("v.site_id", this.requestContext.siteId);
             queryWrapper.eq("v.code", code);
@@ -67,15 +67,15 @@ export class VerifyServiceImplService {
     
             const memberInfoVo: MemberBriefInfoVo = new MemberBriefInfoVo();
             Object.assign(memberInfoVo, model);
-            vo.setMember(memberInfoVo);
+            vo.member = memberInfoVo;
     
             VerifyInfoEventDefiner.const event: VerifyInfoEvent = new VerifyInfoEventDefiner.VerifyInfoEvent();
             event.data = vo;
             const list: VerifyInfoEventDefiner.VerifyInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
             if (!CollectionUtils.isEmpty(list)){
                 for (VerifyInfoEventDefiner.VerifyInfoEventResult verifyInfoEventResult : list) {
-                    if (verifyInfoEventResult != null && verifyInfoEventResult.getDataMap() != null && !verifyInfoEventResult.getDataMap().isEmpty()){
-                        vo.setVerifyInfo(verifyInfoEventResult.getDataMap());
+                    if (verifyInfoEventResult != null && verifyInfoEventResult.dataMap != null && !verifyInfoEventResult.dataMap.isEmpty()){
+                        vo.verifyInfo = verifyInfoEventResult.dataMap;
                         break;
                     }
                 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-config-service-impl.service.ts

@@ -21,17 +21,17 @@ export class WeappConfigServiceImplService {
     const weappConfigVo: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
             weappConfigVo = staticInfo(weappConfigVo);
     
-            if (weappConfigVo.getIsAuthorization() === 1) {
+            if (weappConfigVo.isAuthorization === 1) {
                 try {
                     const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
-                    const domainResult: WxOpenMaDomainResult = this.wxOpenMaService.getDomain();
-                    if (domainResult.getErrcode() === "0") {
+                    const domainResult: WxOpenMaDomainResult = this.wxOpenMaService.domain;
+                    if (domainResult.errcode === "0") {
                         WeappConfigVo.const domain: Domain = new WeappConfigVo.Domain();
-                        domain.setRequestdomain(String.join(";", domainResult.getRequestDomain()));
-                        domain.setWsrequestdomain(String.join(";", domainResult.getWsRequestDomain()));
-                        domain.setUploaddomain(String.join(";", domainResult.getUploadDomain()));
-                        domain.setDownloaddomain(String.join(";", domainResult.getDownloadDomain()));
-                        weappConfigVo.setDomain(domain);
+                        domain.requestdomain = String.join(";", domainResult.requestDomain);
+                        domain.wsrequestdomain = String.join(";", domainResult.wsRequestDomain);
+                        domain.uploaddomain = String.join(";", domainResult.uploadDomain);
+                        domain.downloaddomain = String.join(";", domainResult.downloadDomain);
+                        weappConfigVo.domain = domain;
                     }
                 } catch (e) {
                 }
@@ -44,7 +44,7 @@ export class WeappConfigServiceImplService {
    * setWeappConfig
    */
   async setWeappConfig(weappConfigParam: WeappConfigParam): Promise<any> {
-    this.coreWeappConfigService.setWeappConfig(this.requestContext.siteId, weappConfigParam);
+    this.coreWeappConfigService.weappConfig = this.requestContext.siteId, weappConfigParam;
   }
 
   /**
@@ -55,12 +55,12 @@ export class WeappConfigServiceImplService {
                 const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
                 this.wxOpenMaService.modifyDomain(
                     "set",
-                    CommonUtils.isNotEmpty(param.getRequestdomain()) ? [param.getRequestdomain(].split(";")) : [],
-                    CommonUtils.isNotEmpty(param.getWsrequestdomain())? [param.getWsrequestdomain(].split(";")) : [],
-                    CommonUtils.isNotEmpty(param.getUploaddomain())? [param.getUploaddomain(].split(";")) : [],
-                    CommonUtils.isNotEmpty(param.getDownloaddomain())? [param.getDownloaddomain(].split(";")) : [],
-                    CommonUtils.isNotEmpty(param.getTcpdomain())? [param.getTcpdomain(].split(";")) : [],
-                    CommonUtils.isNotEmpty(param.getUdpdomain())? [param.getUdpdomain(].split(";")) : []
+                    CommonUtils.isNotEmpty(param.requestdomain) ? [param.getRequestdomain(].split(";")) : [],
+                    CommonUtils.isNotEmpty(param.wsrequestdomain)? [param.getWsrequestdomain(].split(";")) : [],
+                    CommonUtils.isNotEmpty(param.uploaddomain)? [param.getUploaddomain(].split(";")) : [],
+                    CommonUtils.isNotEmpty(param.downloaddomain)? [param.getDownloaddomain(].split(";")) : [],
+                    CommonUtils.isNotEmpty(param.tcpdomain)? [param.getTcpdomain(].split(";")) : [],
+                    CommonUtils.isNotEmpty(param.udpdomain)? [param.getUdpdomain(].split(";")) : []
                 );
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -73,7 +73,7 @@ export class WeappConfigServiceImplService {
   async getPrivacySetting(): Promise<any> {
     try {
                 const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
-                return this.wxOpenMaService.getPrivacyService().getPrivacySetting(2);
+                return this.wxOpenMaService.privacyService.getPrivacySetting(2);
             } catch (e) {
                 throw new BadRequestException(e.message);
             }
@@ -86,8 +86,8 @@ export class WeappConfigServiceImplService {
     try {
                 const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
                 const setPrivacySetting: SetPrivacySetting = Object.assign(new SetPrivacySetting(), privacySetting) /* TODO: 检查SetPrivacySetting构造函数 */;
-                setPrivacySetting.setPrivacyVer(2);
-                this.wxOpenMaService.getPrivacyService().setPrivacySetting(setPrivacySetting);
+                setPrivacySetting.privacyVer = 2;
+                this.wxOpenMaService.privacyService.privacySetting = setPrivacySetting;
             } catch (e) {
                 throw new BadRequestException(e.message);
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-template-service-impl.service.ts

@@ -20,12 +20,12 @@ export class WeappTemplateServiceImplService {
     
             for (const item of addonNoticeList) {
                 const filter: NoticeInfoVo[] = [];
-                for (const noticeItem of item.getNotice()) {
-                    if (noticeItem.getSupport_type().indexOf("weapp") != -1) {
+                for (const noticeItem of item.notice) {
+                    if (noticeItem.support_type.indexOf("weapp") != -1) {
                         filter.push(noticeItem);
                     }
                 }
-                item.setNotice(filter);
+                item.notice = filter;
             }
             return addonNoticeList;
   }
@@ -34,15 +34,15 @@ export class WeappTemplateServiceImplService {
    * sync
    */
   async sync(param: WeappTemplateSyncParam): Promise<any> {
-    const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys());
+    const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
             const keys: string[] = [param.getKeys(]);
     
             for (const item of list.values()) {
-                if (item.getWeapp() != null && (keys.length == 0 || keys.includes(item.key))) {
-                    if (item.getWeappTemplateId().length() > 0) {
-                        deleteTemplate(item.getWeappTemplateId());
+                if (item.weapp != null && (keys.length == 0 || keys.includes(item.key))) {
+                    if (item.weappTemplateId.length() > 0) {
+                        deleteTemplate(item.weappTemplateId);
                     }
-                    const templateId: string = addTemplate(item.getWeapp().get("tid").toString(), item.getWeapp().getJSONArray("kid_list").toList(number.class), item.getWeapp().get("scene_desc").toString());
+                    const templateId: string = addTemplate(item.weapp.get("tid").toString(), item.weapp.getJSONArray("kid_list").toList(number.class), item.weapp.get("scene_desc").toString());
                     this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("weapp_template_id", templateId));
                 }
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/weapp/impl/weapp-version-service-impl.service.ts

@@ -42,33 +42,33 @@ export class WeappVersionServiceImplService {
     if (!RequestUtils.handler().getScheme() === "https") throw new BadRequestException("微信小程序请求地址只支持https请先配置ssl");
     
             const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
-            if (weappConfig.getAppId().isEmpty()) throw new BadRequestException("还没有配置微信小程序");
-            if (weappConfig.getUploadPrivateKey().isEmpty()) throw new BadRequestException("还没有配置微信小程序代码上传秘钥");
+            if (weappConfig.appId.isEmpty()) throw new BadRequestException("还没有配置微信小程序");
+            if (weappConfig.uploadPrivateKey.isEmpty()) throw new BadRequestException("还没有配置微信小程序代码上传秘钥");
     
             const uploading: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).eq("status", WeappVersionStatusEnum.APPLET_UPLOADING));
             if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作");
     
             const lastVersion: WeappVersion = this.weappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", this.requestContext.siteId).orderByDesc("version_no").last("limit 1"));
-            const versionNo: number = lastVersion == null ? 1 : lastVersion.getVersionNo() + 1;
+            const versionNo: number = lastVersion == null ? 1 : lastVersion.versionNo + 1;
     
             const addons: string[] = this.coreSiteService.getAddonKeysBySiteId(this.requestContext.siteId);
     
             const uploadParam: WeappUploadParam = new WeappUploadParam();
-            uploadParam.setBaseUrl(RequestUtils.getDomain(true));
-            uploadParam.setAppId(weappConfig.getAppId());
-            uploadParam.setUploadPrivateKey(weappConfig.getUploadPrivateKey());
+            uploadParam.baseUrl = RequestUtils.getDomain(true);
+            uploadParam.appId = weappConfig.appId;
+            uploadParam.uploadPrivateKey = weappConfig.uploadPrivateKey;
             uploadParam.siteId = this.requestContext.siteId;
             uploadParam.version = "1.0." + versionNo;
             uploadParam.desc = param.desc;
-            uploadParam.setAddon(addons);
+            uploadParam.addon = addons;
             const taskKey: string = this.coreWeappCloudService.uploadWeapp(uploadParam);
     
             const model: WeappVersion = new WeappVersion();
             model.siteId = this.requestContext.siteId;
             model.version = uploadParam.version;
-            model.setVersionNo(versionNo);
+            model.versionNo = versionNo;
             model.desc = param.desc;
-            model.setTaskKey(taskKey);
+            model.taskKey = taskKey;
             model.createTime = Date.now( / 1000);
     
             this.weappVersionRepository.save(model);
@@ -86,7 +86,7 @@ export class WeappVersionServiceImplService {
                     if (last.getInt("code", -1).equals(0)) {
                         const model: WeappVersion = new WeappVersion();
                         model.status = WeappVersionStatusEnum.APPLET_UPLOAD_FAIL.status;
-                        model.setFailReason(last.getStr("msg", ""));
+                        model.failReason = last.getStr("msg", "");
                         model.updateTime = Date.now( / 1000);
     
                         this.weappVersionRepository.save(model, /* TODO: any /* TODO: QueryWrapper<WeappVersion> */需改写为TypeORM的where条件对象 */.eq("task_key", key));
@@ -116,14 +116,14 @@ export class WeappVersionServiceImplService {
             );
             if (version == null) return "";
     
-            if (version.getFromType() === "cloud_build") {
-                return this.coreWeappCloudService.getWeappPreviewImage();
+            if (version.fromType === "cloud_build") {
+                return this.coreWeappCloudService.weappPreviewImage;
             } else {
                 try {
                     const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(this.requestContext.siteId);
                     const qrcode: string = this.wxOpenMaService.getTestQrcode("", {});
                     if (fs.existsSync(qrcode)) {
-                        return "data:image/jpeg;base64," + Base64.getEncoder().encodeToString(FileUtils.readFileToByteArray(qrcode));
+                        return "data:image/jpeg;base64," + Base64.encoder.encodeToString(FileUtils.readFileToByteArray(qrcode));
                     }
                     return "";
                 } catch (e) {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-config-service-impl.service.ts

@@ -22,7 +22,7 @@ export class WechatConfigServiceImplService {
    * setWechatConfig
    */
   async setWechatConfig(wechatConfigParam: WechatConfigParam): Promise<any> {
-    this.coreWechatConfigService.setWechatConfig(this.requestContext.siteId, wechatConfigParam);
+    this.coreWechatConfigService.wechatConfig = this.requestContext.siteId, wechatConfigParam;
   }
 
   /**
@@ -33,11 +33,11 @@ export class WechatConfigServiceImplService {
             const request: HttpServletRequest = RequestUtils.handler();
     
             const vo: WechatStaticInfoVo = new WechatStaticInfoVo();
-            vo.setServeUrl(request.getScheme() + "://" + request.getServerName() + "/api/wechat/serve/" + this.requestContext.siteId);
-            vo.setBusinessDomain(sysUrl.getWapDomain());
-            vo.setJsSecureDomain(sysUrl.getWapDomain());
-            vo.setWebAuthDomain(sysUrl.getWapDomain());
-            vo.setEncryptionType(WechatEncryptionTypeEnum.getMap());
+            vo.serveUrl = request.scheme + "://" + request.serverName + "/api/wechat/serve/" + this.requestContext.siteId;
+            vo.businessDomain = sysUrl.wapDomain;
+            vo.jsSecureDomain = sysUrl.wapDomain;
+            vo.webAuthDomain = sysUrl.wapDomain;
+            vo.encryptionType = WechatEncryptionTypeEnum.map;
     
             return vo;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-media-service-impl.service.ts

@@ -43,15 +43,15 @@ export class WechatMediaServiceImplService {
   async image(file: MultipartFile): Promise<any> {
     const param: AttachmentUploadParam = new AttachmentUploadParam();
             param.siteId = this.requestContext.siteId;
-            param.setStorageType("local");
-            param.setFile(file);
-            param.setAttType("image");
-            param.setDir("attachment/image/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "/");
+            param.storageType = "local";
+            param.file = file;
+            param.attType = "image";
+            param.dir = "attachment/image/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "/");
             const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param);
     
             const wxMaterial: WxMpMaterial = new WxMpMaterial();
-            wxMaterial.setFile(this.appConfig.webRootDownResource + uploadRes.url);
-            wxMaterial.name = param.getNewFilename();
+            wxMaterial.file = this.appConfig.webRootDownResource + uploadRes.url;
+            wxMaterial.name = param.newFilename;
     
             try {
                 const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.IMAGE.type, wxMaterial);
@@ -60,7 +60,7 @@ export class WechatMediaServiceImplService {
                 model.siteId = this.requestContext.siteId;
                 model.type = WechatMediaTypeEnum.IMAGE.type;
                 model.value = uploadRes.url;
-                model.setMediaId(res.getMediaId());
+                model.mediaId = res.mediaId;
                 model.createTime = Date.now( / 1000);
                 this.wechatMediaRepository.save(model);
     
@@ -78,17 +78,17 @@ export class WechatMediaServiceImplService {
   async video(file: MultipartFile): Promise<any> {
     const param: AttachmentUploadParam = new AttachmentUploadParam();
             param.siteId = this.requestContext.siteId;
-            param.setStorageType("local");
-            param.setFile(file);
-            param.setAttType("video");
-            param.setDir("attachment/video/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "/");
+            param.storageType = "local";
+            param.file = file;
+            param.attType = "video";
+            param.dir = "attachment/video/" + param.siteId + "/" + (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "/");
             const uploadRes: AttachmentUploadVo = this.coreUploadService.upload(param);
     
             const wxMaterial: WxMpMaterial = new WxMpMaterial();
-            wxMaterial.setFile(this.appConfig.webRootDownResource + uploadRes.url);
-            wxMaterial.name = param.getNewFilename();
-            wxMaterial.setVideoIntroduction((new SimpleDateFormat("yyyyMM/dd").format(new Date())) + "上传");
-            wxMaterial.setVideoTitle(param.getNewFilename());
+            wxMaterial.file = this.appConfig.webRootDownResource + uploadRes.url;
+            wxMaterial.name = param.newFilename;
+            wxMaterial.videoIntroduction = (new SimpleDateFormat("yyyyMM/dd".format(new Date())) + "上传");
+            wxMaterial.videoTitle = param.newFilename;
     
             try {
                 const res: WxMpMaterialUploadResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialFileUpload(WechatMediaTypeEnum.VIDEO.type, wxMaterial);
@@ -97,7 +97,7 @@ export class WechatMediaServiceImplService {
                 model.siteId = this.requestContext.siteId;
                 model.type = WechatMediaTypeEnum.VIDEO.type;
                 model.value = uploadRes.url;
-                model.setMediaId(res.getMediaId());
+                model.mediaId = res.mediaId;
                 model.createTime = Date.now( / 1000);
                 this.wechatMediaRepository.save(model);
     
@@ -117,26 +117,26 @@ export class WechatMediaServiceImplService {
                 const count: number = 20;
     
                 const result: WxMpMaterialNewsBatchGetResult = WechatUtils.mp(this.requestContext.siteId).getMaterialService().materialNewsBatchGet(offset, count);
-                if (result.getItemCount() > 0) {
-                    for (WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem item: result.getItems()) {
-                        const media: WechatMedia = this.wechatMediaRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("media_id", item.getMediaId()));
+                if (result.itemCount > 0) {
+                    for (WxMpMaterialNewsBatchGetResult.WxMaterialNewsBatchGetNewsItem item: result.items) {
+                        const media: WechatMedia = this.wechatMediaRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("media_id", item.mediaId));
     
                         if (CommonUtils.isNotEmpty(media)) {
-                            media.value = JSONUtil.toJsonStr(item.getContent());
+                            media.value = JSONUtil.toJsonStr(item.content);
                             media.updateTime = Date.now( / 1000);
                             wechatMediaMapper.updateById(media);
                         } else {
                             const model: WechatMedia = new WechatMedia();
                             model.siteId = this.requestContext.siteId;
                             model.type = WechatMediaTypeEnum.VIDEO.type;
-                            model.value = JSONUtil.toJsonStr(item.getContent());
-                            model.setMediaId(item.getMediaId());
+                            model.value = JSONUtil.toJsonStr(item.content);
+                            model.mediaId = item.mediaId;
                             model.createTime = Date.now( / 1000);
                             this.wechatMediaRepository.save(model);
                         }
                     }
                 }
-                if (offset <  Math.ceil(result.getTotalCount() / count)) {
+                if (offset <  Math.ceil(result.totalCount / count)) {
                     offset++;
                     this.syncNews(offset);
                 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-menu-service-impl.service.ts

@@ -26,7 +26,7 @@ export class WechatMenuServiceImplService {
                 const params: Record<String , JSONArray> = {};
                 params.put("button", data);
                 WechatUtils.mp(this.requestContext.siteId).getMenuService().menuCreate(JsonUtils.parseObject<any>(params).toString()) ;
-                this.coreConfigService.setConfig(this.requestContext.siteId, "WECHAT_MENU", data);
+                this.coreConfigService.config = this.requestContext.siteId, "WECHAT_MENU", data;
             }catch (e){
                 throw new AdminException(e.message);
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-reply-service-impl.service.ts

@@ -63,13 +63,13 @@ export class WechatReplyServiceImplService {
     const model: WechatReply = new WechatReply();
             model.name = path.basename(addParam);
             model.siteId = this.requestContext.siteId;
-            model.setKeyword(addParam.keyword);
-            model.setReplyType(WechatReplyTypeEnum.REPLY_KEYWORD.type);
-            model.setMatchingType(addParam.getMatchingType());
-            model.setContent(addParam.getContent().toString());
-            model.setSort(addParam.getSort());
+            model.keyword = addParam.keyword;
+            model.replyType = WechatReplyTypeEnum.REPLY_KEYWORD.type;
+            model.matchingType = addParam.matchingType;
+            model.content = addParam.content.toString();
+            model.sort = addParam.sort;
             model.createTime = Date.now( / 1000);
-            model.setReplyMethod(addParam.getReplyMethod());
+            model.replyMethod = addParam.replyMethod;
             this.wechatReplyRepository.save(model);
   }
 
@@ -84,12 +84,12 @@ export class WechatReplyServiceImplService {
             if (!model) throw new BadRequestException("数据不存在!");
     
             model.name = path.basename(editParam);
-            model.setKeyword(editParam.keyword);
-            model.setMatchingType(editParam.getMatchingType());
-            model.setContent(editParam.getContent().toString());
-            model.setSort(editParam.getSort());
+            model.keyword = editParam.keyword;
+            model.matchingType = editParam.matchingType;
+            model.content = editParam.content.toString();
+            model.sort = editParam.sort;
             model.updateTime = Date.now( / 1000);
-            model.setReplyMethod(editParam.getReplyMethod());
+            model.replyMethod = editParam.replyMethod;
             wechatReplyMapper.updateById(model);
   }
 
@@ -112,13 +112,13 @@ export class WechatReplyServiceImplService {
     
             if (CommonUtils.isEmpty(reply)) {
                 const model: WechatReply = new WechatReply();
-                model.setContent(param.getContent().toString());
+                model.content = param.content.toString();
                 model.siteId = this.requestContext.siteId;
-                model.setReplyType(WechatReplyTypeEnum.REPLY_DEFAULT.type);
+                model.replyType = WechatReplyTypeEnum.REPLY_DEFAULT.type;
                 this.wechatReplyRepository.save(model);
             } else {
                 const model: WechatReply = new WechatReply();
-                model.setContent(param.getContent().toString());
+                model.content = param.content.toString();
                 this.wechatReplyRepository.save(model, queryWrapper);
             }
   }
@@ -142,13 +142,13 @@ export class WechatReplyServiceImplService {
     
             if (CommonUtils.isEmpty(reply)) {
                 const model: WechatReply = new WechatReply();
-                model.setContent(param.getContent().toString());
+                model.content = param.content.toString();
                 model.siteId = this.requestContext.siteId;
-                model.setReplyType(WechatReplyTypeEnum.REPLY_DEFAULT.type);
+                model.replyType = WechatReplyTypeEnum.REPLY_DEFAULT.type;
                 this.wechatReplyRepository.save(model);
             } else {
                 const model: WechatReply = new WechatReply();
-                model.setContent(param.getContent().toString());
+                model.content = param.content.toString();
                 this.wechatReplyRepository.save(model, queryWrapper);
             }
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wechat/impl/wechat-template-service-impl.service.ts

@@ -20,12 +20,12 @@ export class WechatTemplateServiceImplService {
     
             for (const item of addonNoticeList) {
                 const filter: NoticeInfoVo[] = [];
-                for (const noticeItem of item.getNotice()) {
-                    if (noticeItem.getSupport_type().indexOf("wechat") != -1) {
+                for (const noticeItem of item.notice) {
+                    if (noticeItem.support_type.indexOf("wechat") != -1) {
                         filter.push(noticeItem);
                     }
                 }
-                item.setNotice(filter);
+                item.notice = filter;
             }
             return addonNoticeList;
   }
@@ -34,15 +34,15 @@ export class WechatTemplateServiceImplService {
    * sync
    */
   async sync(param: WechatTemplateSyncParam): Promise<any> {
-    const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.getKeys());
+    const list: Record<String, NoticeInfoVo> = this.coreNoticeService.getList(this.requestContext.siteId, param.keys);
             const keys: string[] = [param.getKeys(]);
     
             for (const item of list.values()) {
-                if (item.getWechat() != null && (keys.length == 0 || keys.includes(item.key))) {
-                    if (item.getWeappTemplateId().length() > 0) {
-                        deleteTemplate(item.getWeappTemplateId());
+                if (item.wechat != null && (keys.length == 0 || keys.includes(item.key))) {
+                    if (item.weappTemplateId.length() > 0) {
+                        deleteTemplate(item.weappTemplateId);
                     }
-                    const templateId: string = addTemplate(item.getWechat().get("temp_key").toString(), item.getWechat().getJSONArray("keyword_name_list").toList(String.class));
+                    const templateId: string = addTemplate(item.wechat.get("temp_key").toString(), item.wechat.getJSONArray("keyword_name_list").toList(String.class));
                     this.coreNoticeService.edit(this.requestContext.siteId, item.key, new Record<string, any>().set("wechat_template_id", templateId));
                 }
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-config-service-impl.service.ts

@@ -15,7 +15,7 @@ export class OplatformConfigServiceImplService {
    * getOplatformStaticInfo
    */
   async getOplatformStaticInfo(): Promise<any> {
-    return this.coreOplatformConfigService.getOplatformStaticInfo();
+    return this.coreOplatformConfigService.oplatformStaticInfo;
   }
 
   /**
@@ -37,6 +37,6 @@ export class OplatformConfigServiceImplService {
    * setWxOplatformConfig
    */
   async setWxOplatformConfig(oplatformConfigParam: OplatformConfigParam): Promise<any> {
-    this.coreOplatformConfigService.setOplatformConfig(oplatformConfigParam);
+    this.coreOplatformConfigService.oplatformConfig = oplatformConfigParam;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-server-service-impl.service.ts

@@ -16,27 +16,27 @@ export class OplatformServerServiceImplService {
    */
   async server(param: OplatformServerParam): Promise<any> {
     if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase())
-                || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.getTimestamp(), param.getNonce(), param.getSignature())) {
+                || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.timestamp, param.nonce, param.signature)) {
                 throw new IllegalArgumentException("非法请求");
             }
     
-            const inMessage: WxOpenXmlMessage = WxOpenXmlMessage.fromEncryptedXml(param.getRequestBody(), WechatUtils.WxOpen().getWxOpenConfigStorage(), param.getTimestamp(), param.getNonce(), param.getMsgSignature());
+            const inMessage: WxOpenXmlMessage = WxOpenXmlMessage.fromEncryptedXml(param.requestBody, WechatUtils.WxOpen().getWxOpenConfigStorage(), param.timestamp, param.nonce, param.msgSignature);
             log.info("开放平台授权事件推送消息：{}", inMessage);
     
             try {
                 WechatUtils.WxOpen().getWxOpenComponentService().route(inMessage);
     
                 // 授权取消
-                if (inMessage.getInfoType() === "unauthorized") {
-                    this.oplatformService.clearAuthorization(inMessage.getAuthorizerAppid());
+                if (inMessage.infoType === "unauthorized") {
+                    this.oplatformService.clearAuthorization(inMessage.authorizerAppid);
                 }
                 // 更新授权
-                if (inMessage.getInfoType() === "updateauthorized") {
-                    const siteId: number = this.coreOplatformService.getSiteIdByAuthorizerAppid(inMessage.getAuthorizerAppid());
+                if (inMessage.infoType === "updateauthorized") {
+                    const siteId: number = this.coreOplatformService.getSiteIdByAuthorizerAppid(inMessage.authorizerAppid);
                     RequestUtils.siteId = siteId;
     
                     const authorizationParam: AuthorizationParam = new AuthorizationParam();
-                    authorizationParam.setAuthCode(inMessage.getAuthorizationCode());
+                    authorizationParam.authCode = inMessage.authorizationCode;
                     this.oplatformService.authorization(authorizationParam);
                 }
             } catch (e) {
@@ -49,20 +49,20 @@ export class OplatformServerServiceImplService {
    */
   async message(appid: string, param: OplatformServerParam): Promise<any> {
     if (!StringUtils.toLowerCase() === "aes", param.getEncryptType(.toLowerCase())
-                || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.getTimestamp(), param.getNonce(), param.getSignature())) {
+                || !WechatUtils.WxOpen().getWxOpenComponentService().checkSignature(param.timestamp, param.nonce, param.signature)) {
                 throw new IllegalArgumentException("非法请求");
             }
     
-            const inMessage: WxMpXmlMessage = WxOpenXmlMessage.fromEncryptedMpXml(param.getRequestBody(), WechatUtils.WxOpen().getWxOpenConfigStorage(), param.getTimestamp(), param.getNonce(), param.getMsgSignature());
+            const inMessage: WxMpXmlMessage = WxOpenXmlMessage.fromEncryptedMpXml(param.requestBody, WechatUtils.WxOpen().getWxOpenConfigStorage(), param.timestamp, param.nonce, param.msgSignature);
             log.info("开放平台消息与事件推送消息：{}", inMessage);
     
-           if (inMessage.getMsgType() === WxConsts.XmlMsgType.EVENT) {
+           if (inMessage.msgType === WxConsts.XmlMsgType.EVENT) {
                // 小程序审核成功
-               if (inMessage.getEvent() === WxConsts.EventType.WEAPP_AUDIT_SUCCESS) {
+               if (inMessage.event === WxConsts.EventType.WEAPP_AUDIT_SUCCESS) {
                    weappAuditSuccess(inMessage);
                }
                // 小程序审核失败
-               if (inMessage.getEvent() === WxConsts.EventType.WEAPP_AUDIT_FAIL) {
+               if (inMessage.event === WxConsts.EventType.WEAPP_AUDIT_FAIL) {
                     weappAuditFail(inMessage);
                }
            }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/oplatform-service-impl.service.ts

@@ -33,39 +33,39 @@ export class OplatformServiceImplService {
    */
   async authorization(param: AuthorizationParam): Promise<any> {
     try {
-                const queryAuth: WxOpenQueryAuthResult = WechatUtils.WxOpen().getWxOpenComponentService().getQueryAuth(param.getAuthCode());
+                const queryAuth: WxOpenQueryAuthResult = WechatUtils.WxOpen().getWxOpenComponentService().getQueryAuth(param.authCode);
     
                 // 授权账号信息 授权信息
-                const result: WxOpenAuthorizerInfoResult = WechatUtils.WxOpen().getWxOpenComponentService().getAuthorizerInfo(queryAuth.getAuthorizationInfo().getAuthorizerAppid());
+                const result: WxOpenAuthorizerInfoResult = WechatUtils.WxOpen().getWxOpenComponentService().getAuthorizerInfo(queryAuth.authorizationInfo.getAuthorizerAppid());
     
-                const authorizerInfo: WxOpenAuthorizerInfo = result.getAuthorizerInfo();
-                const authorization: WxOpenAuthorizationInfo = result.getAuthorizationInfo();
+                const authorizerInfo: WxOpenAuthorizerInfo = result.authorizerInfo;
+                const authorization: WxOpenAuthorizationInfo = result.authorizationInfo;
     
                 // 小程序
-                if (CommonUtils.isNotEmpty(authorizerInfo.getMiniProgramInfo())) {
+                if (CommonUtils.isNotEmpty(authorizerInfo.miniProgramInfo)) {
                     this.weappCheck(authorizerInfo, authorization);
     
                     const weappConfig: WeappConfigParam = new WeappConfigParam();
-                    weappConfig.setAppId(authorization.getAuthorizerAppid());
-                    weappConfig.setWeappName(authorizerInfo.getNickName());
-                    weappConfig.setWeappOriginal(authorizerInfo.getUserName());
-                    weappConfig.setIsAuthorization(1);
-                    weappConfig.setQrCode(this.coreFetchService.image(authorizerInfo.getQrcodeUrl(), this.requestContext.siteId));
-                    this.coreWeappConfigService.setWeappConfig(this.requestContext.siteId, weappConfig);
+                    weappConfig.appId = authorization.authorizerAppid;
+                    weappConfig.weappName = authorizerInfo.nickName;
+                    weappConfig.weappOriginal = authorizerInfo.userName;
+                    weappConfig.isAuthorization = 1;
+                    weappConfig.qrCode = this.coreFetchService.image(authorizerInfo.qrcodeUrl, this.requestContext.siteId);
+                    this.coreWeappConfigService.weappConfig = this.requestContext.siteId, weappConfig;
     
-                    this.coreWeappConfigService.setWeappAuthorizationInfo(this.requestContext.siteId, result);
+                    this.coreWeappConfigService.weappAuthorizationInfo = this.requestContext.siteId, result;
                 } else { // 公众号
                     this.wechatCheck(authorizerInfo, authorization);
     
                     const wechatConfig: WechatConfigParam = new WechatConfigParam();
-                    wechatConfig.setAppId(authorization.getAuthorizerAppid());
-                    wechatConfig.setWechatName(authorizerInfo.getNickName());
-                    wechatConfig.setWechatOriginal(authorizerInfo.getUserName());
-                    wechatConfig.setIsAuthorization(1);
-                    wechatConfig.setQrcode(this.coreFetchService.image(authorizerInfo.getQrcodeUrl(), this.requestContext.siteId));
-                    this.coreWechatConfigService.setWechatConfig(this.requestContext.siteId, wechatConfig);
+                    wechatConfig.appId = authorization.authorizerAppid;
+                    wechatConfig.wechatName = authorizerInfo.nickName;
+                    wechatConfig.wechatOriginal = authorizerInfo.userName;
+                    wechatConfig.isAuthorization = 1;
+                    wechatConfig.qrcode = this.coreFetchService.image(authorizerInfo.qrcodeUrl, this.requestContext.siteId);
+                    this.coreWechatConfigService.wechatConfig = this.requestContext.siteId, wechatConfig;
     
-                    this.coreWechatConfigService.setWechatAuthorizationInfo(this.requestContext.siteId, result);
+                    this.coreWechatConfigService.wechatAuthorizationInfo = this.requestContext.siteId, result;
                 }
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -102,8 +102,8 @@ export class OplatformServiceImplService {
                 Object.assign(vo, item);
                 vo.value = JsonUtils.parseObject<any>(item.value);
                 const siteInfo: Site = new Site();
-                siteInfo.setSiteName(item.getSiteName());
-                vo.setSite(siteInfo);
+                siteInfo.siteName = item.siteName;
+                vo.site = siteInfo;
                 listInfo.push(vo);
             }
             return  PageResult.build(page, limit, iPageTotal).setData(listInfo);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/admin/wxoplatform/impl/weapp-version-service-impl.service.ts

@@ -74,32 +74,32 @@ export class WeappVersionServiceImplService {
             if (uploading != null) throw new BadRequestException("小程序有正在上传的版本，请等待上一版本上传完毕后再进行操作");
     
             const lastVersion: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                .eq("site_group_id", siteGroup.getGroupId())
+                .eq("site_group_id", siteGroup.groupId)
                 .orderByDesc("id")
                 .last("limit 1")
             );
     
-            const config: OplatformConfigVo = this.coreOplatformConfigService.getWxOplatformConfig();
+            const config: OplatformConfigVo = this.coreOplatformConfigService.wxOplatformConfig;
     
             const addon: string[] = CollUtil.newArrayList();
-            if (!siteGroup.getApp().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getApp()));
-            if (!siteGroup.getAddon().isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.getAddon()));
+            if (!siteGroup.app.isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.app));
+            if (!siteGroup.addon.isEmpty()) CollUtil.addAll(addon, JSONUtil.parseArray(siteGroup.addon));
     
             const weappUploadParam: WeappUploadParam = new WeappUploadParam();
-            weappUploadParam.setAppId(config.getDevelopAppId());
-            weappUploadParam.setBaseUrl(RequestUtils.getDomain(true));
+            weappUploadParam.appId = config.developAppId;
+            weappUploadParam.baseUrl = RequestUtils.getDomain(true);
             weappUploadParam.siteId = 0;
-            weappUploadParam.version = "1." + siteGroup.getGroupId( + "." + (lastVersion == null ? 1 : lastVersion.getVersionNo() + 1));
-            weappUploadParam.setUploadPrivateKey(config.getDevelopUploadPrivateKey());
-            weappUploadParam.setAddon(addon);
+            weappUploadParam.version = "1." + siteGroup.groupId + "." + (lastVersion == null ? 1 : lastVersion.versionNo + 1);
+            weappUploadParam.uploadPrivateKey = config.developUploadPrivateKey;
+            weappUploadParam.addon = addon;
             const taskKey: string = this.coreWeappCloudService.uploadWeapp(weappUploadParam);
     
             const model: WxOplatfromWeappVersion = new WxOplatfromWeappVersion();
-            model.setSiteGroupId(siteGroup.getGroupId());
-            model.setUserVersion(weappUploadParam.version);
-            model.setVersionNo(lastVersion == null ? 1 : lastVersion.getVersionNo() + 1);
+            model.siteGroupId = siteGroup.groupId;
+            model.userVersion = weappUploadParam.version;
+            model.versionNo = lastVersion == null ? 1 : lastVersion.versionNo + 1;
             model.createTime = Date.now( / 1000);
-            model.setTaskKey(taskKey);
+            model.taskKey = taskKey;
             this.wxOplatfromWeappVersionRepository.save(model);
     
             this.weappVersionService.getVersionUploadResult(taskKey, isAll);
@@ -124,28 +124,28 @@ export class WeappVersionServiceImplService {
             const wxOpenService: WxOpenComponentService = WechatUtils.WxOpen().getWxOpenComponentService();
     
             try {
-                const draftList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateDraftList();
+                const draftList: WxOpenMaCodeTemplate[] = this.wxOpenService.templateDraftList;
                 if (CommonUtils.isNotEmpty(draftList)) {
                     for (const item of draftList) {
-                        if (item.getUserVersion() === version.getUserVersion()) {
+                        if (item.userVersion === version.userVersion) {
                             // 添加模板
-                            this.wxOpenService.addToTemplate(item.getDraftId());
+                            this.wxOpenService.addToTemplate(item.draftId);
     
-                            const templateList: WxOpenMaCodeTemplate[] = this.wxOpenService.getTemplateList();
+                            const templateList: WxOpenMaCodeTemplate[] = this.wxOpenService.templateList;
                             for (const template of templateList) {
-                                if (template.getUserVersion() === version.getUserVersion()) {
-                                    version.setTemplateId(template.getTemplateId().toString());
+                                if (template.userVersion === version.userVersion) {
+                                    version.templateId = template.templateId.toString();
                                     wxOplatfromWeappVersionMapper.updateById(version);
     
                                     // 删除之前的模板
                                     const prev: WxOplatfromWeappVersion = this.wxOplatfromWeappVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                                        .eq("site_group_id", version.getSiteGroupId())
+                                        .eq("site_group_id", version.siteGroupId)
                                         .lt("id", version.id)
                                         .orderByDesc("id")
                                         .last("limit 1")
                                     );
                                     if (prev!= null) {
-                                        this.wxOpenService.deleteTemplate(number.valueOf(prev.getTemplateId()));
+                                        this.wxOpenService.deleteTemplate(number.valueOf(prev.templateId));
                                     }
                                     break;
                                 }
@@ -160,12 +160,12 @@ export class WeappVersionServiceImplService {
     
             if (isAll) {
                 const siteGroup: SiteGroup = this.siteGroupRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
-                    .gt("group_id", version.getSiteGroupId())
+                    .gt("group_id", version.siteGroupId)
                     .orderByDesc("group_id")
                     .last("limit 1")
                 );
                 if (siteGroup != null) {
-                    this.weappVersionService.push(siteGroup.getGroupId(), true);
+                    this.weappVersionService.push(siteGroup.groupId, true);
                 }
             }
   }
@@ -189,25 +189,25 @@ export class WeappVersionServiceImplService {
     
             try {
                 const extJson: Record<string, any> = new Record<string, any>();
-                extJson.set("extAppid", weappCofig.getAppId());
+                extJson.set("extAppid", weappCofig.appId);
                 extJson.set("entryPagePath", "app/pages/index/index");
                 extJson.set("directCommit", true);
                 extJson.putByPath("ext.site_id", siteId);
     
                 const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService()
-                    .getWxMaServiceByAppid(weappCofig.getAppId())
-                    .codeCommit(number.valueOf(version.getTemplateId()), version.getUserVersion(), version.getUserDesc(), extJson);
+                    .getWxMaServiceByAppid(weappCofig.appId)
+                    .codeCommit(number.valueOf(version.templateId), version.userVersion, version.userDesc, extJson);
     
-                if (!commitResult.getErrcode() === "0") throw new BadRequestException(commitResult.getErrmsg());
+                if (!commitResult.errcode === "0") throw new BadRequestException(commitResult.errmsg);
     
                 const model: WeappVersion = new WeappVersion();
                 model.siteId = siteId;
-                model.version = version.getUserVersion();
-                model.setVersionNo(version.getVersionNo());
-                model.desc = version.getUserDesc();
+                model.version = version.userVersion;
+                model.versionNo = version.versionNo;
+                model.desc = version.userDesc;
                 model.status = WeappVersionStatusEnum.APPLET_AUDITING.status;
                 model.createTime = Date.now( / 1000);
-                model.setFromType("open_platform");
+                model.fromType = "open_platform";
                 this.weappVersionRepository.save(model);
     
                 // 提交审核
@@ -228,10 +228,10 @@ export class WeappVersionServiceImplService {
             try {
                 const wxOpenMaService: WxOpenMaService = (WxOpenMaService) WechatUtils.miniapp(siteId);
     
-                const privacyInfo: WxOpenMaGetCodePrivacyInfoResult = this.wxOpenMaService.getCodePrivacyInfo();
-                if (!privacyInfo.getErrcode() === "0") {
+                const privacyInfo: WxOpenMaGetCodePrivacyInfoResult = this.wxOpenMaService.codePrivacyInfo;
+                if (!privacyInfo.errcode === "0") {
                     version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
-                    version.setFailReason(privacyInfo.getErrmsg());
+                    version.failReason = privacyInfo.errmsg;
                     version.updateTime = Date.now( / 1000);
                     weappVersionMapper.updateById(version);
                     return;
@@ -240,10 +240,10 @@ export class WeappVersionServiceImplService {
                 const submitAuditMessage: WxOpenMaSubmitAuditMessage = new WxOpenMaSubmitAuditMessage();
                 const submitResult: WxOpenMaSubmitAuditResult = this.wxOpenMaService.submitAudit(submitAuditMessage);
     
-                version.status = submitResult.getErrcode( === "0" ? WeappVersionStatusEnum.APPLET_AUDITING.status :  WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status);
-                version.setFailReason(submitResult.getErrmsg());
+                version.status = submitResult.errcode === "0" ? WeappVersionStatusEnum.APPLET_AUDITING.status :  WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
+                version.failReason = submitResult.errmsg;
                 version.updateTime = Date.now( / 1000);
-                version.setAuditid(ObjectUtil.isNotNull(submitResult.getAuditId()) ? submitResult.getAuditId().toString() : "");
+                version.auditid = ObjectUtil.isNotNull(submitResult.auditId ? submitResult.auditId.toString() : "");
     
                 weappVersionMapper.updateById(version);
     
@@ -252,14 +252,14 @@ export class WeappVersionServiceImplService {
                 }
             } catch (e) {
                 // 如果检测任务结束未结束
-                if (e.getError().getErrorCode() == 61039) {
+                if (e.error.getErrorCode() == 61039) {
                     if (scheduler == null || scheduler.isShutdown() || scheduler.isTerminated()) {
                         scheduler = Executors.newScheduledThreadPool(1);
                     }
                     scheduler.schedule(() => submitAudit(siteId, versionId), 30, TimeUnit.SECONDS);
                 } else {
                     version.status = WeappVersionStatusEnum.APPLET_AUDIT_FAIL.status;
-                    version.setFailReason(e.getError().getErrorMsg());
+                    version.failReason = e.error.getErrorMsg();
                     version.updateTime = Date.now( / 1000);
                     weappVersionMapper.updateById(version);
     
@@ -279,7 +279,7 @@ export class WeappVersionServiceImplService {
    */
   async siteWeappCommit(): Promise<any> {
     const site: SiteInfoVo = this.coreSiteService.getSiteCache(this.requestContext.siteId);
-            this.weappCommit(site.siteId, site.getGroupId(), null);
+            this.weappCommit(site.siteId, site.groupId, null);
   }
 
   /**
@@ -300,7 +300,7 @@ export class WeappVersionServiceImplService {
                 if (lastVersion != null) {
                     const versionVo: WxOplatfromWeappVersionVo = new WxOplatfromWeappVersionVo();
                     Object.assign(versionVo, lastVersion);
-                    vo.setCommitRecord(versionVo);
+                    vo.commitRecord = versionVo;
                 }
                 list.push(vo);
             }
@@ -320,7 +320,7 @@ export class WeappVersionServiceImplService {
     
             try {
                 const commitResult: WxOpenResult = WechatUtils.WxOpen().getWxOpenComponentService()
-                    .getWxMaServiceByAppid(weappCofig.getAppId()).undoCodeAudit();
+                    .getWxMaServiceByAppid(weappCofig.appId).undoCodeAudit();
             } catch (e) {
                 throw new BadRequestException(e.message);
             }
@@ -341,12 +341,12 @@ export class WeappVersionServiceImplService {
             );
             if (!version) throw new BadRequestException("平台尚未上传小程序到模板库");
     
-            const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.getSiteGroupId())).stream().map(Site::getSiteId);
+            const siteIds: number[] = this.siteRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("group_id", param.siteGroupId)).stream().map(Site::getSiteId);
             if (CommonUtils.isNotEmpty(siteIds)) {
                 const authSite: SysConfig[] = this.sysConfigRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("config_key", ConfigKeyEnum.path.basename(WEAPP_AUTHORIZATION_INFO)));
                 if (CommonUtils.isNotEmpty(authSite)) {
                     authSite.forEach(item => {
-                        weappCommit(item.siteId, param.getSiteGroupId(), version);
+                        weappCommit(item.siteId, param.siteGroupId, version);
                     });
                 }
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/channel/impl/app-service-impl.service.ts

@@ -20,15 +20,15 @@ export class AppServiceImplService {
     try {
                 const app: WxMpService = WechatUtils.app(this.requestContext.siteId);
     
-                const wxOAuth2AccessToken: WxOAuth2AccessToken = app.getOAuth2Service().getAccessToken(param.getCode());
-                const wxUser: WxOAuth2UserInfo = app.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
+                const wxOAuth2AccessToken: WxOAuth2AccessToken = app.oAuth2Service.getAccessToken(param.code);
+                const wxUser: WxOAuth2UserInfo = app.oAuth2Service.getUserInfo(wxOAuth2AccessToken, null);
     
                 return this.login(
-                    ObjectUtil.defaultIfNull(wxUser.getOpenid(), ""),
-                    ObjectUtil.defaultIfNull(wxUser.getUnionId(), ""),
-                    ObjectUtil.defaultIfNull(wxUser.getNickname(), ""),
-                    ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""),
-                    param.getPid()
+                    ObjectUtil.defaultIfNull(wxUser.openid, ""),
+                    ObjectUtil.defaultIfNull(wxUser.unionId, ""),
+                    ObjectUtil.defaultIfNull(wxUser.nickname, ""),
+                    ObjectUtil.defaultIfNull(wxUser.headImgUrl, ""),
+                    param.pid
                 );
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -40,8 +40,8 @@ export class AppServiceImplService {
    */
   async getNewVersion(param: GetNewVersionParam): Promise<any> {
     const appVersion: AppVersion = this.appVersionRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
-                .eq("platform", param.getPlatform())
-                .gt("version_code", param.getVersionCode())
+                .eq("platform", param.platform)
+                .gt("version_code", param.versionCode)
                 .eq("status", AppDict.StatusEnum.STATUS_PUBLISHED.value)
                 .orderByDesc("version_code"));
     
@@ -59,7 +59,7 @@ export class AppServiceImplService {
    * register
    */
   async register(param: AuthRegisterParam): Promise<any> {
-    switch (param.getRegisterType()) {
+    switch (param.registerType) {
                 case "wechat":
                     return wechatRegister(param);
                 default:
@@ -76,7 +76,7 @@ export class AppServiceImplService {
             BeanUtil.copyProperties(config, vo);
     
             const weappConfig: WeappConfigVo = this.coreWeappConfigService.getWeappConfig(this.requestContext.siteId);
-            vo.setWeappOriginal(weappConfig.getWeappOriginal());
+            vo.weappOriginal = weappConfig.weappOriginal;
             return vo;
   }
 
@@ -84,27 +84,27 @@ export class AppServiceImplService {
    * wechatRegister
    */
   async wechatRegister(param: AuthRegisterParam): Promise<any> {
-    if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空");
+    if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
             try {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
     
-                if (!param.getUnionid().isEmpty()) {
+                if (!param.unionid.isEmpty()) {
                     const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                     if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
                 }
     
                 const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
-                if (config.getIsBindMobile() == 1) {
-                    if (param.getMobile().isEmpty()) throw new BadRequestException("手机号不能为空");
-                    this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode());
+                if (config.isBindMobile == 1) {
+                    if (param.mobile.isEmpty()) throw new BadRequestException("手机号不能为空");
+                    this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
                 }
     
                 const registerMember: Member = new Member();
-                registerMember.setWxappOpenid(param.getOpenid());
-                registerMember.setMobile(param.getMobile());
-                registerMember.setWxUnionid(param.getUnionid());
-                registerMember.setPid(param.getPid());
+                registerMember.wxappOpenid = param.openid;
+                registerMember.mobile = param.mobile;
+                registerMember.wxUnionid = param.unionid;
+                registerMember.pid = param.pid;
                 return this.registerService.register(registerMember);
             } catch (e) {
                 throw new BadRequestException(e.message);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-form-service-impl.service.ts

@@ -153,7 +153,7 @@ export class DiyFormServiceImplService {
             if (CommonUtils.isNotEmpty(diyFormSubmitConfig)) {
                 BeanUtil.copyProperties(diyFormSubmitConfig, configInfoVo);
             }
-            vo.setDiyFormSubmitConfig(configInfoVo);
+            vo.diyFormSubmitConfig = configInfoVo;
             return vo;
   }
 
@@ -175,7 +175,7 @@ export class DiyFormServiceImplService {
                     Object.assign(diyFormRecordsFieldsListVo, item);
                     volist.push(diyFormRecordsFieldsListVo);
                 }
-                vo.setRecordsFieldList(volist);
+                vo.recordsFieldList = volist;
             }
             return vo;
   }
@@ -190,7 +190,7 @@ export class DiyFormServiceImplService {
             }
             const formId: number = memberConfig.formId;
             MPJany /* TODO: QueryWrapper<DiyFormRecords> */ mpjqw = new MPJQueryWrapper();
-            mpjqw.setAlias("fr").leftJoin("?_diy_form_records_fields frf on frf.record_id = fr.record_id".replace("?_", this.appConfig.tablePrefix));
+            mpjqw.alias = "fr".leftJoin("?_diy_form_records_fields frf on frf.record_id = fr.record_id".replace("?_", this.appConfig.tablePrefix));
             mpjqw.select("frf.form_id, frf.form_field_id, frf.field_key, frf.field_type, frf.field_name, frf.field_value, frf.field_required, frf.field_unique, frf.privacy_protection");
             mpjqw.eq("fr.member_id", this.requestContext.memberId)
                     .eq("fr.form_id", formId)
@@ -198,7 +198,7 @@ export class DiyFormServiceImplService {
             const diyFormRecordsFields: DiyFormRecordsFields[] = diyFormRecordsMapper.selectJoinList(DiyFormRecordsFields.class, mpjqw);
     
             MPJany /* TODO: QueryWrapper<DiyForm> */ diyFormMpjqw = new MPJQueryWrapper();
-            diyFormMpjqw.setAlias("df")
+            diyFormMpjqw.alias = "df"
                     .leftJoin("?_diy_form_fields dfi on dfi.form_id = df.form_id".replace("?_", this.appConfig.tablePrefix));
             diyFormMpjqw.select("df.form_id,df.type, dfi.field_id, dfi.field_key, dfi.field_type, dfi.field_name, dfi.field_required, dfi.field_hidden, dfi.field_unique, dfi.privacy_protection");
             diyFormMpjqw.eq("df.form_id", formId).eq("df.status", 1);
@@ -214,9 +214,9 @@ export class DiyFormServiceImplService {
     
             const result: DiyMemberRecordVo = setResult(diyFormFields);
             const fieldMap: Record<String, DiyFormRecordsFields> = diyFormRecordsFields.collect(/* Collectors已删除 */.toMap(DiyFormRecordsFields::getFieldKey, field => field));
-            for (const field of result.getFormField()) {
-                if (fieldMap.containsKey(field.getFieldKey())) {
-                    field.setFieldValue(fieldMap.get(field.getFieldKey()).getFieldValue() == null ? "" : fieldMap.get(field.getFieldKey()).getFieldValue());
+            for (const field of result.formField) {
+                if (fieldMap.containsKey(field.fieldKey)) {
+                    field.fieldValue = fieldMap.get(field.fieldKey.getFieldValue() == null ? "" : fieldMap.get(field.fieldKey).getFieldValue());
                 }
             }
             return result;
@@ -226,7 +226,7 @@ export class DiyFormServiceImplService {
    * editRecord
    */
   async editRecord(param: DiyFormRecordsParam): Promise<any> {
-    const diyFormRecords: DiyFormRecords = diyFormRecordsMapper.selectById(param.getRecordId());
+    const diyFormRecords: DiyFormRecords = diyFormRecordsMapper.selectById(param.recordId);
             if (CommonUtils.isEmpty(diyFormRecords)) {
                 throw new ApiException("表单记录不存在");
             }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/diy/impl/diy-service-impl.service.ts

@@ -70,10 +70,10 @@ export class DiyServiceImplService {
                             info.title = pageData.getStr("title");
                             info.name = pageData.getStr("type");
                             info.type = pageData.getStr("type");
-                            info.setTemplate(pageData.getStr("template"));
-                            info.setMode(pageData.getStr("mode"));
+                            info.template = pageData.getStr("template");
+                            info.mode = pageData.getStr("mode");
                             info.value = pageData.getRecord<string, any>("data".toString());
-                            info.setIsDefault(1);
+                            info.isDefault = 1;
                         }
                     }
                 }
@@ -115,12 +115,12 @@ export class DiyServiceImplService {
    * tabbarList
    */
   async tabbarList(param: DiyTabbarListParam): Promise<any> {
-    const list: BottomConfigVo[] = this.coreDiyConfigService.getBottomList();
+    const list: BottomConfigVo[] = this.coreDiyConfigService.bottomList;
             const site: SiteInfoVo = this.coreSiteService.getSiteCache(param.siteId());
     
             const tabbarList: BottomConfigVo[] = [];
             for (const item of list) {
-                if (item.key === "app" && list.length > 1 && site.getApps().size() == 1) continue;
+                if (item.key === "app" && list.length > 1 && site.apps.size() == 1) continue;
                 const config: BottomConfigVo = this.coreDiyConfigService.getBottomConfig(param.siteId(), item.key);
                 tabbarList.push(config);
             }
@@ -134,20 +134,20 @@ export class DiyServiceImplService {
   async share(param: DiyShareParam): Promise<any> {
     any /* TODO: QueryWrapper<DiyRoute> */ queryWrapper = new QueryWrapper();
             queryWrapper.select("id,title,name,page,share,is_share");
-            queryWrapper.eq("page", param.getRoute());
+            queryWrapper.eq("page", param.route);
             queryWrapper.eq("site_id", param.siteId());
     
             const diyRoute: DiyRoute = this.diyRouteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
-            if (diyRoute == null || diyRoute.getShare().isEmpty()) return new Record<string, any>();
+            if (diyRoute == null || diyRoute.share.isEmpty()) return new Record<string, any>();
     
-            const share: Record<string, any> = JsonUtils.parseObject<any>(diyRoute.getShare());
+            const share: Record<string, any> = JsonUtils.parseObject<any>(diyRoute.share);
             share.set("route", diyRoute.page);
             share.set("query", "");
     
             const query: Record<string, any> = new Record<string, any>();
     
-            if (param.getParams() != null && !param.getParams().isEmpty()) {
-                query = JsonUtils.parseObject<any>(param.getParams());
+            if (param.params != null && !param.params.isEmpty()) {
+                query = JsonUtils.parseObject<any>(param.params);
             }
     
             if (param.memberId() != null && param.memberId() > 0) {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/auth-service-impl.service.ts

@@ -17,7 +17,7 @@ export class AuthServiceImplService {
     const siteId: number = RequestUtils.apiSiteId();
     
             if (siteId == 0) {
-                const site: Site = this.siteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_domain", RequestUtils.getRequestDomain()));
+                const site: Site = this.siteRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_domain", RequestUtils.requestDomain));
                 if (site == null) throw new UnauthorizedException("站点不存在", 403);
                 siteId = site.siteId;
             }
@@ -26,9 +26,9 @@ export class AuthServiceImplService {
             if(CommonUtils.isEmpty(siteInfoVo)){
                 throw new UnauthorizedException("站点不存在", 403);
             }
-            const rule: string = RequestUtils.getReqeustURI();
+            const rule: string = RequestUtils.reqeustURI;
             if (rule !== "site"){
-                if(siteInfoVo.status == SiteStatusEnum.CLOSE.getCode() || siteInfoVo.getExpireTime() < DateUtils.currTime()){
+                if(siteInfoVo.status == SiteStatusEnum.CLOSE.code || siteInfoVo.expireTime < DateUtils.currTime()){
                     throw new UnauthorizedException("站点已停止", 402);
                 }
             }
@@ -59,15 +59,15 @@ export class AuthServiceImplService {
     const channel: string = RequestUtils.channel();
             const siteId: number = this.requestContext.siteId;
             if (channel != null){
-                if (channel === ChannelEnum.H5.getCode()){
+                if (channel === ChannelEnum.H5.code){
                     const h5ConfigVo: H5ConfigVo = this.coreH5Service.getH5(siteId);
-                    const isOpen: number = h5ConfigVo.getIsOpen();
+                    const isOpen: number = h5ConfigVo.isOpen;
                     if(isOpen==0){
                         throw new UnauthorizedException("站点已停止", 402);
                     }
-                }else if (channel === ChannelEnum.PC.getCode()){
+                }else if (channel === ChannelEnum.PC.code){
                     const pcConfigVo: PcConfigVo = this.corePcService.getPc(siteId);
-                    const isOpen: number = pcConfigVo.getIsOpen();
+                    const isOpen: number = pcConfigVo.isOpen;
                     if(isOpen==0){
                         throw new UnauthorizedException("站点已停止", 402);
                     }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/login-service-impl.service.ts

@@ -27,11 +27,11 @@ export class LoginServiceImplService {
    * account
    */
   async account(param: AccountLoginParam): Promise<number> {
-    const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).and(i => i.eq("username", param.getUsername()).or().eq("mobile", param.getUsername())));
+    const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).and(i => i.eq("username", param.username).or().eq("mobile", param.username)));
     
             if (ObjectUtil.isNull(member)) throw new BadRequestException("账号不存在");
-            if (!PasswordEncipher.matche(param.getPassword(), member.getPassword())) throw new BadRequestException("账号或密码错误");
-            member.setLoginType(MemberLoginTypeEnum.USERNAME.type);
+            if (!PasswordEncipher.matche(param.password, member.password)) throw new BadRequestException("账号或密码错误");
+            member.loginType = MemberLoginTypeEnum.USERNAME.type;
     
             return this.login(member);
   }
@@ -43,12 +43,12 @@ export class LoginServiceImplService {
     const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
     
             if (member != null) {
-                member.setLoginType(MemberLoginTypeEnum.MOBILE.type);
+                member.loginType = MemberLoginTypeEnum.MOBILE.type;
                 return this.login(member);
             } else {
                 const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
                 // 开启强制绑定手机号 登录会自动注册
-                if (config.getIsBindMobile() == 1) {
+                if (config.isBindMobile == 1) {
                     const registerParam: MobileRegisterParam = new MobileRegisterParam();
                     Object.assign(registerParam, param);
                     return this.registerService.mobile(registerParam);
@@ -64,35 +64,35 @@ export class LoginServiceImplService {
     member = memberMapper.selectById(member.memberId);
             if (StatusEnum.OFF === member.status) throw new BadRequestException("账号被锁定");
     
-            member.setLoginTime(Date.now() / 1000);
-            member.setLoginIp(RequestUtils.ip());
-            member.setLoginCount(member.getLoginCount() + 1);
-            member.setLoginChannel(RequestUtils.channel());
-            if (member.getLoginType() != null) member.setLoginType(member.getLoginType());
-            member.setLastVisitTime(Date.now() / 1000);
+            member.loginTime = Date.now( / 1000);
+            member.loginIp = RequestUtils.ip();
+            member.loginCount = member.loginCount + 1;
+            member.loginChannel = RequestUtils.channel();
+            if (member.loginType != null) member.loginType = member.loginType;
+            member.lastVisitTime = Date.now( / 1000);
             this.memberMapper.updateById(member);
     
             const loginModel: SaLoginModel = SaLoginModel.create();
-            loginModel.setDevice(RequestUtils.handler().getHeader("User-Agent"));
-            loginModel.setExtra("memberId", member.memberId);
-            loginModel.setExtra("username", member.getUsername());
-            loginModel.setExtra("siteId", member.siteId);
+            loginModel.device = RequestUtils.handler(.getHeader("User-Agent"));
+            loginModel.extra = "memberId", member.memberId;
+            loginModel.extra = "username", member.username;
+            loginModel.extra = "siteId", member.siteId;
             // 执行登录
             StpUtil.login("member-" + member.memberId, loginModel);
             // 获取返回内容
-            const saTokenInfo: SaTokenInfo = StpUtil.getTokenInfo();
+            const saTokenInfo: SaTokenInfo = StpUtil.tokenInfo;
     
             const vo: LoginVo = new LoginVo();
-            vo.setToken(saTokenInfo.getTokenValue());
-            vo.setExpiresTime(DateUtils.currTime()+saTokenInfo.getTokenTimeout());
-            vo.setMobile(member.getMobile());
+            vo.token = saTokenInfo.tokenValue;
+            vo.expiresTime = DateUtils.currTime(+saTokenInfo.tokenTimeout);
+            vo.mobile = member.mobile;
     
             // 会员登录事件
             const loginEvent: MemberLoginEvent = new MemberLoginEvent();
             loginEvent.siteId = this.requestContext.siteId;
             loginEvent.addAppSign("core");
             loginEvent.name = "MemberLoginEvent";
-            loginEvent.setMember(member);
+            loginEvent.member = member;
             EventPublisher.publishEvent(loginEvent);
     
             return vo;
@@ -102,10 +102,10 @@ export class LoginServiceImplService {
    * resetPassword
    */
   async resetPassword(param: ResetPasswordParam): Promise<any> {
-    const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId));
+    const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
             if (ObjectUtil.isNull(member)) throw new BadRequestException("当前填写的手机号不存在账号");
     
-            member.setPassword(PasswordEncipher.encode(param.getPassword()));
+            member.password = PasswordEncipher.encode(param.password);
             this.memberMapper.updateById(member);
   }
 
@@ -123,13 +123,13 @@ export class LoginServiceImplService {
     const key: string = RandomUtil.randomString(30);
     
             const cache: MobileCodeCacheVo = new MobileCodeCacheVo();
-            cache.setMobile(param.getMobile());
-            cache.setCode(String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999)));
+            cache.mobile = param.mobile;
+            cache.code = String.format("%0" + 4 + "d", RandomUtil.randomInt(1, 9999));
             cache.type = param.type;
     
             const data: Record<String, Object> = {};
-            data.put("mobile", param.getMobile());
-            data.put("code", cache.getCode());
+            data.put("mobile", param.mobile);
+            data.put("code", cache.code);
     
             this.coreNoticeService.send(param.siteId(), "member_verify_code", data);
     

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/login/impl/register-service-impl.service.ts

@@ -18,31 +18,31 @@ export class RegisterServiceImplService {
    */
   async checkLoginConfig(type: string): Promise<any> {
     const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
-            if (MemberLoginTypeEnum.USERNAME.type === type && config.getIsUsername() != 1) throw new BadRequestException("未开启账号登录注册");
-            if (MemberLoginTypeEnum.MOBILE.type === type && config.getIsMobile() != 1) throw new BadRequestException("未开启手机验证码登录注册");
+            if (MemberLoginTypeEnum.USERNAME.type === type && config.isUsername != 1) throw new BadRequestException("未开启账号登录注册");
+            if (MemberLoginTypeEnum.MOBILE.type === type && config.isMobile != 1) throw new BadRequestException("未开启手机验证码登录注册");
   }
 
   /**
    * account
    */
   async account(param: AccountRegisterParam): Promise<number> {
-    const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("username", param.getUsername()).eq("site_id", this.requestContext.siteId));
+    const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("username", param.username).eq("site_id", this.requestContext.siteId));
             if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在");
     
-            if (!param.getMobile().isEmpty()) {
-                const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId));
+            if (!param.mobile.isEmpty()) {
+                const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号");
-                this.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode());
+                this.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
             }
     
             const member: Member = new Member();
-            member.setUsername(param.getUsername());
-            member.setNickname(param.getUsername());
-            member.setPassword(PasswordEncipher.encode(param.getPassword()));
-            member.setMobile(param.getMobile());
-            member.setRegisterType(MemberRegisterTypeEnum.USERNAME.type);
-            member.setLoginType(MemberLoginTypeEnum.USERNAME.type);
-            member.setPid(param.getPid());
+            member.username = param.username;
+            member.nickname = param.username;
+            member.password = PasswordEncipher.encode(param.password);
+            member.mobile = param.mobile;
+            member.registerType = MemberRegisterTypeEnum.USERNAME.type;
+            member.loginType = MemberLoginTypeEnum.USERNAME.type;
+            member.pid = param.pid;
     
             return this.register(member);
   }
@@ -51,18 +51,18 @@ export class RegisterServiceImplService {
    * mobile
    */
   async mobile(param: MobileRegisterParam): Promise<any> {
-    const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId));
+    const memberExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
             if (ObjectUtil.isNotNull(memberExist)) throw new BadRequestException("账号已存在");
     
             const member: Member = new Member();
-            member.setMobile(param.getMobile());
-            member.setNickname(param.getMobile().substring(0, 3) + "****" + param.getMobile().substring(7));
-            member.setRegisterType(MemberRegisterTypeEnum.MOBILE.type);
-            member.setLoginType(MemberLoginTypeEnum.MOBILE.type);
-            member.setPid(param.getPid());
-            member.setHeadimg(ObjectUtil.defaultIfNull(param.getAvatar(), ""));
-            member.setNickname(ObjectUtil.defaultIfNull(param.getNickname(), ""));
-            member.setWxOpenid(ObjectUtil.defaultIfNull(param.getOpenid(), ""));
+            member.mobile = param.mobile;
+            member.nickname = param.mobile.substring(0, 3 + "****" + param.mobile.substring(7));
+            member.registerType = MemberRegisterTypeEnum.MOBILE.type;
+            member.loginType = MemberLoginTypeEnum.MOBILE.type;
+            member.pid = param.pid;
+            member.headimg = ObjectUtil.defaultIfNull(param.avatar, "");
+            member.nickname = ObjectUtil.defaultIfNull(param.nickname, "");
+            member.wxOpenid = ObjectUtil.defaultIfNull(param.openid, "");
     
             return this.register(member);
   }
@@ -72,30 +72,30 @@ export class RegisterServiceImplService {
    */
   async register(member: Member): Promise<any> {
     const request: HttpServletRequest = RequestUtils.handler();
-            const pid: number = ObjectUtil.defaultIfNull(member.getPid(), 0);
+            const pid: number = ObjectUtil.defaultIfNull(member.pid, 0);
             if (pid > 0) {
-                const inviteMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("member_id", member.getPid()).eq("site_id", this.requestContext.siteId));
-                if (inviteMember == null) member.setPid(0);
+                const inviteMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("member_id", member.pid).eq("site_id", this.requestContext.siteId));
+                if (inviteMember == null) member.pid = 0;
             }
-            if (member.getMobile() != null && !member.getMobile().isEmpty()) {
-                const mobile: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", member.getMobile()).eq("site_id", this.requestContext.siteId));
+            if (member.mobile != null && !member.mobile.isEmpty()) {
+                const mobile: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", member.mobile).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(mobile)) throw new BadRequestException("账号已存在");
             }
     
-            if (CommonUtils.isEmpty(member.getNickname())) {
-                if (CommonUtils.isNotEmpty(member.getUsername())) {
-                    member.setNickname(member.getUsername());
-                } else if (CommonUtils.isNotEmpty(member.getMobile())) {
-                    member.setNickname(member.getMobile().substring(0, 3) + "****" + member.getMobile().substring(7));
+            if (CommonUtils.isEmpty(member.nickname)) {
+                if (CommonUtils.isNotEmpty(member.username)) {
+                    member.nickname = member.username;
+                } else if (CommonUtils.isNotEmpty(member.mobile)) {
+                    member.nickname = member.mobile.substring(0, 3 + "****" + member.mobile.substring(7));
                 } else {
-                    member.setNickname(createName());
+                    member.nickname = createName();
                 }
             }
     
             member.siteId = this.requestContext.siteId;
             member.createTime = Date.now( / 1000);
-            member.setMemberNo(this.coreMemberService.createMemberNo(this.requestContext.siteId));
-            member.setRegisterChannel(RequestUtils.channel());
+            member.memberNo = this.coreMemberService.createMemberNo(this.requestContext.siteId);
+            member.registerChannel = RequestUtils.channel();
             this.this.memberRepository.save(member);
     
             // 会员注册事件
@@ -103,7 +103,7 @@ export class RegisterServiceImplService {
             registerEvent.siteId = this.requestContext.siteId;
             registerEvent.addAppSign("core");
             registerEvent.name = "MemberRegisterEvent";
-            registerEvent.setMember(member);
+            registerEvent.member = member;
             EventPublisher.publishEvent(registerEvent);
     
             return this.loginService.login(member);
@@ -120,7 +120,7 @@ export class RegisterServiceImplService {
             if (ObjectUtil.isNull(cache)) throw new BadRequestException("手机验证码有误");
             const vo: MobileCodeCacheVo = new MobileCodeCacheVo();
             Object.assign(vo, cache);
-            if (!vo.getMobile() === mobile || !vo.getCode() === mobileCode) throw new BadRequestException("手机验证码有误");
+            if (!vo.mobile === mobile || !vo.code === mobileCode) throw new BadRequestException("手机验证码有误");
             cached.remove(mobileKey);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-account-service-impl.service.ts

@@ -21,11 +21,11 @@ export class MemberAccountServiceImplService {
     any /* TODO: QueryWrapper<MemberAccountLog> */ queryWrapper = new QueryWrapper();
             queryWrapper.select("id");
             queryWrapper.eq("member_id", param.memberId());
-            if (StrUtil.isNotEmpty(param.getAccountType())) {
-                queryWrapper.eq("account_type", param.getAccountType());
+            if (StrUtil.isNotEmpty(param.accountType)) {
+                queryWrapper.eq("account_type", param.accountType);
             }
-            if (StrUtil.isNotEmpty(param.getFromType())) {
-                queryWrapper.eq("from_type", param.getFromType());
+            if (StrUtil.isNotEmpty(param.fromType)) {
+                queryWrapper.eq("from_type", param.fromType);
             }
             if (CommonUtils.isNotEmpty(param.createTime)) {
                 QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime);
@@ -39,7 +39,7 @@ export class MemberAccountServiceImplService {
    */
   async getAccountSource(param: AccountAccountSourceParam): Promise<number> {
     const jsonObject: Record<string, any> = JsonModuleLoader.build().mergeResultElement("account_change_type.json");
-            const accountTypeObject: Record<string, any> = jsonObject.getRecord<string, any>(param.getAccountType());
+            const accountTypeObject: Record<string, any> = jsonObject.getRecord<string, any>(param.accountType);
             if (accountTypeObject == null) {
                 throw new BaseException("MEMBER_TYPE_NOT_EXIST");
             }
@@ -59,11 +59,11 @@ export class MemberAccountServiceImplService {
             if (member == null) {
                 throw new BaseException("会员不存在");
             }
-            if (member.getPoint() != null) {
-                accountPointCountVo.setPoint(member.getPoint());
+            if (member.point != null) {
+                accountPointCountVo.point = member.point;
             }
-            if (member.getPointGet() != null) {
-                accountPointCountVo.setPointGet(member.getPointGet());
+            if (member.pointGet != null) {
+                accountPointCountVo.pointGet = member.pointGet;
             }
     
             const accountLog: MemberAccountLog = this.memberAccountLogRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }))
@@ -74,7 +74,7 @@ export class MemberAccountServiceImplService {
                     .groupBy("member_id")
             );
             if (accountLog != null) {
-                accountPointCountVo.setUse(Math.abs(accountLog.getAccountData().doubleValue()));
+                accountPointCountVo.use = Math.abs(accountLog.accountData.doubleValue());
             }
             return accountPointCountVo;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-address-service-impl.service.ts

@@ -22,7 +22,7 @@ export class MemberAddressServiceImplService {
     // 校验区域有效性
     //        this.checkAndFillAddressValue(param);
             // 默认地址设定
-            if (param.getIsDefault() != null && param.getIsDefault() == 1) {
+            if (param.isDefault != null && param.isDefault == 1) {
                 try {
                     this.deleteDefaultAddress(param.memberId());
                 } catch (e) {
@@ -66,7 +66,7 @@ export class MemberAddressServiceImplService {
     // 校验区域有效性
             // this.checkAndFillAddressValue(param);
             // 默认地址设定
-            if (param.getIsDefault() != null && param.getIsDefault() == 1) {
+            if (param.isDefault != null && param.isDefault == 1) {
                 try {
                     deleteDefaultAddress(param.memberId());
                 } catch (e) {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-cash-out-service-impl.service.ts

@@ -42,12 +42,12 @@ export class MemberCashOutServiceImplService {
     
             if (vo != null) {
                 MemberCashOutInfoVo.const transfer: Transfer = new MemberCashOutInfoVo.Transfer();
-                transfer.setTransferNo(vo.getTransferNo());
-                transfer.setTransferRemark(vo.getTransferRemark());
-                transfer.setTransferVoucher(vo.getTransferVoucher());
-                transfer.setExtra(vo.getExtra());
-                transfer.setPackageInfo(vo.getPackageInfo());
-                vo.setTransfer(transfer);
+                transfer.transferNo = vo.transferNo;
+                transfer.transferRemark = vo.transferRemark;
+                transfer.transferVoucher = vo.transferVoucher;
+                transfer.extra = vo.extra;
+                transfer.packageInfo = vo.packageInfo;
+                vo.transfer = transfer;
             }
     
             return vo;
@@ -64,7 +64,7 @@ export class MemberCashOutServiceImplService {
    * transferMethod
    */
   async transferMethod(param: MemberCashOutTransferMethodParam): Promise<any> {
-    return TransferTypeEnum.getMap();
+    return TransferTypeEnum.map;
   }
 
   /**
@@ -112,7 +112,7 @@ export class MemberCashOutServiceImplService {
             queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
             queryWrapper.eq("site_id", param.siteId());
             queryWrapper.eq("member_id", param.memberId());
-            if (CommonUtils.isNotEmpty(param.getAccountType())) queryWrapper.eq("account_type", param.getAccountType());
+            if (CommonUtils.isNotEmpty(param.accountType)) queryWrapper.eq("account_type", param.accountType);
             queryWrapper.orderByDesc(["create_time"]);
             [MemberCashOutAccount[], number] iPage = this.this.memberCashOutAccountRepository.findAndCount({ /* TODO: 将MyBatis分页参数改为TypeORM的skip/take */ }), queryWrapper);
             const dataList: MemberCashOutAccountVo[] = CollectUtils.convert(iPageRecords, MemberCashOutAccountVo.class);
@@ -125,7 +125,7 @@ export class MemberCashOutServiceImplService {
   async accountDetails(param: MemberCashOutAccountDetailsParam): Promise<number> {
     any /* TODO: QueryWrapper<MemberCashOutAccount> */ queryWrapper = new QueryWrapper();
             queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
-            queryWrapper.eq("account_id", param.getAccountId());
+            queryWrapper.eq("account_id", param.accountId);
             queryWrapper.eq("site_id", param.siteId());
             queryWrapper.eq("member_id", param.memberId());
             const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -142,7 +142,7 @@ export class MemberCashOutServiceImplService {
             queryWrapper.select("account_id,site_id,member_id,account_type,bank_name,realname,account_no,transfer_payment_code");
             queryWrapper.eq("site_id", param.siteId());
             queryWrapper.eq("member_id", param.memberId());
-            if (CommonUtils.isNotEmpty(param.getAccountType())) queryWrapper.eq("account_type", param.getAccountType());
+            if (CommonUtils.isNotEmpty(param.accountType)) queryWrapper.eq("account_type", param.accountType);
             queryWrapper.orderByDesc("create_time");
             queryWrapper.last("limit 1");
             const memberCashOutAccount: MemberCashOutAccount = this.this.memberCashOutAccountRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -164,7 +164,7 @@ export class MemberCashOutServiceImplService {
             Object.assign(newMemberCashOutAccount, param);
             this.this.memberCashOutAccountRepository.save(newMemberCashOutAccount);
             // 返回当前对象的ID
-            return newMemberCashOutAccount.getAccountId();
+            return newMemberCashOutAccount.accountId;
   }
 
   /**
@@ -179,7 +179,7 @@ export class MemberCashOutServiceImplService {
             }
             const newMemberCashOutAccount: MemberCashOutAccount = new MemberCashOutAccount();
             Object.assign(newMemberCashOutAccount, param);
-            newMemberCashOutAccount.setAccountId(accountId);
+            newMemberCashOutAccount.accountId = accountId;
             newMemberCashOutAccount.updateTime = Date.now( / 1000);
             return this.memberCashOutAccountMapper.updateById(newMemberCashOutAccount);
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-level-service-impl.service.ts

@@ -42,7 +42,7 @@ export class MemberLevelServiceImplService {
     
             if (memberLevelList == null) return null;
     
-            const levelStyle: Record<string, any> = MemberLevelStyleEnum.getStyle();
+            const levelStyle: Record<string, any> = MemberLevelStyleEnum.style;
     
             const filling: Record<string, any> = new Record<string, any>();
             filling.put("benefits_one", new Record<string, any>().set("title", "专属客服").set("desc", "专业服务").set("icon", "/static/resource/images/member/benefits/benefits_kefu.png"));
@@ -56,32 +56,32 @@ export class MemberLevelServiceImplService {
                 const vo: MemberLevelInfoVo = new MemberLevelInfoVo();
                 Object.assign(vo, level);
     
-                if (CommonUtils.isNotEmpty(level.getLevelBenefits())) {
-                    const benefits: Record<string, any> = JsonUtils.parseObject<any>(level.getLevelBenefits());
+                if (CommonUtils.isNotEmpty(level.levelBenefits)) {
+                    const benefits: Record<string, any> = JsonUtils.parseObject<any>(level.levelBenefits);
                     benefits = this.coreMemberService.getBenefitsContent(param.siteId(), benefits, "member_level");
-                    vo.setLevelBenefits(benefits);
+                    vo.levelBenefits = benefits;
                 } else {
-                    vo.setLevelBenefits(filling);
+                    vo.levelBenefits = filling;
                 }
     
-                if (vo.getLevelBenefits().size() < 4) {
+                if (vo.levelBenefits.size() < 4) {
                     for (const key of filling.keySet()) {
-                        if (vo.getLevelBenefits().size() == 4) break;
-                        vo.getLevelBenefits().putByPath(key + ".content", filling.get(key));
+                        if (vo.levelBenefits.size() == 4) break;
+                        vo.levelBenefits.putByPath(key + ".content", filling.get(key));
                     }
                 }
     
-                if (!level.getLevelGifts().isEmpty()) {
-                    const gifts: Record<string, any> = JsonUtils.parseObject<any>(level.getLevelGifts());
+                if (!level.levelGifts.isEmpty()) {
+                    const gifts: Record<string, any> = JsonUtils.parseObject<any>(level.levelGifts);
                     gifts = this.coreMemberService.getGiftContent(param.siteId(), gifts, "member_level");
-                    vo.setLevelGifts(gifts);
+                    vo.levelGifts = gifts;
                 }
                 const levelKey: number = index % 7 + 1;
-                vo.setLevelBg("/static/resource/images/member/level/bg_" + levelKey + ".png");
-                vo.setMemberBg("/static/resource/images/member/level/member_" + levelKey + ".png");
-                vo.setLevelIcon("/static/resource/images/member/level/level_icon" + levelKey + ".png");
-                vo.setLevelTag("/static/resource/images/member/level/level_" + levelKey + ".png");
-                vo.setLevelStyle(levelStyle.getRecord<string, any>("level_" + levelKey));
+                vo.levelBg = "/static/resource/images/member/level/bg_" + levelKey + ".png";
+                vo.memberBg = "/static/resource/images/member/level/member_" + levelKey + ".png";
+                vo.levelIcon = "/static/resource/images/member/level/level_icon" + levelKey + ".png";
+                vo.levelTag = "/static/resource/images/member/level/level_" + levelKey + ".png";
+                vo.levelStyle = levelStyle.getRecord<string, any>("level_" + levelKey);
     
                 list.push(vo);
                 index++;
@@ -95,7 +95,7 @@ export class MemberLevelServiceImplService {
    */
   async findMemberLevel(memberId: number): Promise<any> {
     MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("m")
+            queryWrapper.alias = "m"
                     .leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("ml.*");
             queryWrapper.eq("m.member_id", memberId);
@@ -106,8 +106,8 @@ export class MemberLevelServiceImplService {
             const vo: MemberLevelInfoVo = new MemberLevelInfoVo();
             Object.assign(vo, level);
     
-            if (CommonUtils.isNotEmpty(level.getLevelBenefits()) && JSONUtil.isJson(level.getLevelBenefits())) vo.setLevelBenefits(JsonUtils.parseObject<any>(level.getLevelBenefits()));
-            if (CommonUtils.isNotEmpty(level.getLevelGifts()) && JSONUtil.isJson(level.getLevelGifts())) vo.setLevelGifts(JsonUtils.parseObject<any>(level.getLevelGifts()));
+            if (CommonUtils.isNotEmpty(level.levelBenefits) && JSONUtil.isJson(level.levelBenefits)) vo.levelBenefits = JsonUtils.parseObject<any>(level.levelBenefits);
+            if (CommonUtils.isNotEmpty(level.levelGifts) && JSONUtil.isJson(level.levelGifts)) vo.levelGifts = JsonUtils.parseObject<any>(level.levelGifts);
     
             return vo;
   }
@@ -118,13 +118,13 @@ export class MemberLevelServiceImplService {
   async getMobile(mobileCode: string): Promise<any> {
     try {
                 const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(mobileCode);
-                const mobile: string = phoneInfo.getPurePhoneNumber();
+                const mobile: string = phoneInfo.purePhoneNumber;
     
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", mobile).eq("site_id", this.requestContext.siteId));
                 if (member != null) throw new BadRequestException("当前手机号已绑定账号");
     
                 const vo: MemberGetMobileVo = new MemberGetMobileVo();
-                vo.setMobile(mobile);
+                vo.mobile = mobile;
                 return vo;
             } catch (e) {
                 throw new BadRequestException(e.message);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-service-impl.service.ts

@@ -23,7 +23,7 @@ export class MemberServiceImplService {
    */
   async info(param: MemberInfoParam): Promise<any> {
     MPJany /* TODO: QueryWrapper<Member> */ queryWrapper = new MPJQueryWrapper();
-            queryWrapper.setAlias("m")
+            queryWrapper.alias = "m"
                 .leftJoin("?_member_level ml ON ml.level_id = m.member_level".replace("?_", this.appConfig.tablePrefix));
             queryWrapper.select("member_id, m.site_id, username, member_no, mobile, register_channel, nickname, headimg, member_level, member_label, login_ip, login_type, login_time, m.create_time, last_visit_time, last_consum_time, sex, m.status, birthday, point, balance, m.growth, is_member, member_time, is_del, province_id, city_id, district_id, address, location, money, money_get, wx_openid, weapp_openid, commission, commission_get, commission_cash_outing, ml.level_name as member_level_name");
             queryWrapper.eq("member_id", param.memberId());
@@ -32,15 +32,15 @@ export class MemberServiceImplService {
             const memberInfoVo: MemberInfoVo = memberMapper.selectJoinOne(MemberInfoVo.class, queryWrapper);
             if (CommonUtils.isNotEmpty(memberInfoVo)){
                 const memberConfig: MemberConfigVo = this.coreMemberConfigService.getMemberConfig(memberInfoVo.siteId);
-                memberInfoVo.setFormId(memberConfig.formId == null ? "" : memberConfig.formId.toString());
-                memberInfoVo.setFormRecordId("");
+                memberInfoVo.formId = memberConfig.formId == null ? "" : memberConfig.formId.toString();
+                memberInfoVo.formRecordId = "";
                 if (StringUtils.isNotEmpty(memberInfoVo.formId)){
                     const diyFormRecords: DiyFormRecords = this.diyFormRecordsRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })
                             .eq(DiyFormRecords::getFormId, memberConfig.formId)
                             .eq(DiyFormRecords::getMemberId, memberInfoVo.memberId)
                             .orderByDesc(DiyFormRecords::getCreateTime));
                     if (CommonUtils.isNotEmpty(diyFormRecords)){
-                        memberInfoVo.setFormRecordId(diyFormRecords.getRecordId().toString());
+                        memberInfoVo.formRecordId = diyFormRecords.recordId.toString();
                     }
                 }
             }
@@ -75,24 +75,24 @@ export class MemberServiceImplService {
             const newMember: Member = new Member();
             newMember.memberId = oldMember.memberId;
     
-            switch (param.getField()) {
+            switch (param.field) {
                 case "nickname":
-                    newMember.setNickname(String(param.value));
+                    newMember.nickname = String(param.value);
                     break;
                 case "headimg":
-                    newMember.setHeadimg(String(param.value));
+                    newMember.headimg = String(param.value);
                     break;
                 case "member_label":
-                    newMember.setMemberLabel(String(param.value));
+                    newMember.memberLabel = String(param.value);
                     break;
                 case "member_level":
-                    newMember.setMemberLevel(number.parseInt(String(param.value)));
+                    newMember.memberLevel = number.parseInt(String(param.value));
                     break;
                 case "birthday":
-                    newMember.setBirthday(String(param.value));
+                    newMember.birthday = String(param.value);
                     break;
                 case "sex":
-                    newMember.setSex(number.parseInt(String(param.value)));
+                    newMember.sex = number.parseInt(String(param.value));
                     break;
                 default:
                     throw new BadRequestException("不允许修改的信息");
@@ -109,11 +109,11 @@ export class MemberServiceImplService {
     
             const newMember: Member = new Member();
             newMember.memberId = oldMember.memberId;
-            if (CommonUtils.isNotEmpty(param.data.getNickname())) newMember.setNickname(param.data.getNickname());
-            if (CommonUtils.isNotEmpty(param.data.getHeadimg())) newMember.setHeadimg(param.data.getHeadimg());
-            if (CommonUtils.isNotEmpty(param.data.getBirthday())) newMember.setBirthday(param.data.getBirthday());
-            if (CommonUtils.isNotEmpty(param.data.getSex())) newMember.setSex(param.data.getSex());
-            if (CommonUtils.isNotEmpty(param.data.getLastVisitTime())) newMember.setLastVisitTime(param.data.getLastVisitTime());
+            if (CommonUtils.isNotEmpty(param.data.getNickname())) newMember.nickname = param.data.getNickname();
+            if (CommonUtils.isNotEmpty(param.data.getHeadimg())) newMember.headimg = param.data.getHeadimg();
+            if (CommonUtils.isNotEmpty(param.data.getBirthday())) newMember.birthday = param.data.getBirthday();
+            if (CommonUtils.isNotEmpty(param.data.getSex())) newMember.sex = param.data.getSex();
+            if (CommonUtils.isNotEmpty(param.data.getLastVisitTime())) newMember.lastVisitTime = param.data.getLastVisitTime();
             return this.memberMapper.updateById(newMember);
   }
 
@@ -124,12 +124,12 @@ export class MemberServiceImplService {
     const oldMember: Member = this.memberMapper.selectById(param.memberId());
             if (!oldMember) throw new BadRequestException("会员不存在");
     
-            if (CommonUtils.isNotEmpty(param.getMobile())) {
-                this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode());
-            } else if (CommonUtils.isNotEmpty(param.getMobileCode())) {
+            if (CommonUtils.isNotEmpty(param.mobile)) {
+                this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
+            } else if (CommonUtils.isNotEmpty(param.mobileCode)) {
                 try {
-                    const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.getMobileCode());
-                    param.setMobile(phoneInfo.getPurePhoneNumber());
+                    const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.mobileCode);
+                    param.mobile = phoneInfo.purePhoneNumber;
                 } catch (e) {
                     throw new BadRequestException(e.message);
                 }
@@ -137,12 +137,12 @@ export class MemberServiceImplService {
                 throw new BadRequestException("手机号不存在");
             }
     
-            const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.getMobile()).eq("site_id", this.requestContext.siteId));
+            const mobileExist: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("mobile", param.mobile).eq("site_id", this.requestContext.siteId));
             if (ObjectUtil.isNotNull(mobileExist)) throw new BadRequestException("当前手机号已绑定账号");
     
             const newMember: Member = new Member();
             newMember.memberId = param.memberId();
-            newMember.setMobile(param.getMobile());
+            newMember.mobile = param.mobile;
     
             return this.memberMapper.updateById(newMember);
   }
@@ -153,7 +153,7 @@ export class MemberServiceImplService {
   async log(param: MemberLogParam): Promise<any> {
     const updateMember: Member = new Member();
             updateMember.memberId = param.memberId();
-            updateMember.setLastVisitTime(DateUtils.currTime());
+            updateMember.lastVisitTime = DateUtils.currTime();
             this.memberMapper.updateById(updateMember);
             return 1;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/member/impl/member-sign-service-impl.service.ts

@@ -41,7 +41,7 @@ export class MemberSignServiceImplService {
   async signDetails(param: MemberSignDetailsParam): Promise<any> {
     const queryWrapper: QueryWrapper = new QueryWrapper();
             queryWrapper.select("sign_id, site_id, member_id, days, day_award, continue_award, continue_tag, create_time, is_sign");
-            queryWrapper.eq("sign_id", param.getSignId());
+            queryWrapper.eq("sign_id", param.signId);
             queryWrapper.eq("site_id", param.siteId());
             queryWrapper.eq("member_id", param.memberId());
             const memberSignList: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ });
@@ -60,28 +60,28 @@ export class MemberSignServiceImplService {
     const signConfig: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG");
             const config: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), signConfig) /* TODO: 检查MemberSignConfigVo构造函数 */;
     
-            if (!config.getIsUse()) throw new Error("签到未开启");
+            if (!config.isUse) throw new Error("签到未开启");
     
             // 获取今天的签到
-            const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatTodayString());
+            const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatTodayString);
             if (todayMemberSign != null) throw new Error("今日已签到");
     
             const vo: MemberSignOperateVo = new MemberSignOperateVo();
             vo.title = "签到成功";
-            vo.setInfo("恭喜您获得以下奖励");
+            vo.info = "恭喜您获得以下奖励";
     
             // 获取昨天的签到
-            const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatYesterdayString());
+            const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatYesterdayString);
     
             const days: number = 1;
             if (yesterdayMemberSign != null) {
                 //连签天数大于签到周期，连签天数重置为1
-                days = yesterdayMemberSign.getDays() + 1;
-                if (days > config.getSignPeriod()) {
+                days = yesterdayMemberSign.days + 1;
+                if (days > config.signPeriod) {
                     days = 1;
                 }
-                if (CommonUtils.isNotEmpty(config.getContinueAward())) {
-                    const continueSigns: JSONArray = config.getContinueAward();
+                if (CommonUtils.isNotEmpty(config.continueAward)) {
+                    const continueSigns: JSONArray = config.continueAward;
                     CollUtil.sort(continueSigns, Comparator.comparing(o => ((Record<string, any>) o).getInt("continue_sign")).reversed());
                     // 获取最大的连签天数
                     const maxContinueSign: number = continueSigns.getRecord<string, any>(0).getInt("continue_sign");
@@ -95,26 +95,26 @@ export class MemberSignServiceImplService {
             const model: MemberSign = new MemberSign();
             model.siteId = param.siteId();
             model.memberId = param.memberId();
-            model.setIsSign(1);
+            model.isSign = 1;
             model.createTime = Date.now( / 1000);
-            model.setDays(days);
-            model.setDayAward(config.getDayAward().toString());
-            model.setContinueAward("");
-            if (days === 1) model.setStartTime(Date.now() / 1000);
+            model.days = days;
+            model.dayAward = config.dayAward.toString();
+            model.continueAward = "";
+            if (days === 1) model.startTime = Date.now( / 1000);
             this.memberSignRepository.save(model);
     
             // 发放日签奖励
             const dayAwardVar: Record<String, Object> = {};
             dayAwardVar.put("from_type", "day_sign_award");
             dayAwardVar.put("memo", "日签奖励");
-            this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.getDayAward(), dayAwardVar);
-            vo.setAwards(this.coreMemberService.getGiftContent(param.siteId(), config.getDayAward(), "member_sign"));
+            this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), config.dayAward, dayAwardVar);
+            vo.awards = this.coreMemberService.getGiftContent(param.siteId(, config.dayAward, "member_sign"));
     
             // 发放连签奖励
-            if (config.getContinueAward().size() > 0) {
+            if (config.continueAward.size() > 0) {
                 const continueAward: Record<string, any> = null;
-                for (const i of number = 0; i < config.getContinueAward().size(); i++) {
-                    const item: Record<string, any> = config.getContinueAward().getRecord<string, any>(i);
+                for (const i of number = 0; i < config.continueAward.size(); i++) {
+                    const item: Record<string, any> = config.continueAward.getRecord<string, any>(i);
                     if (item.getInt("continue_sign").equals(days)) {
                         // 是否限制领取
                         if (item.getInt("receive_limit").equals(2)) {
@@ -128,7 +128,7 @@ export class MemberSignServiceImplService {
                                 .last("limit 1")
                             ).getStartTime();
                             // 周期结束时间
-                            const periodEndTime: number = periodStartTime + (config.getSignPeriod() * 86400);
+                            const periodEndTime: number = periodStartTime + (config.signPeriod * 86400);
                             // 领取次数
                             const receiveNum: number = this.memberSignRepository.count({ /* TODO: 将QueryWrapper改为where条件 */ }))
                                .eq("site_id", param.siteId())
@@ -146,7 +146,7 @@ export class MemberSignServiceImplService {
                 }
     
                 if (continueAward != null) {
-                    model.setContinueTag(continueAward.getStr("continue_tag"));
+                    model.continueTag = continueAward.getStr("continue_tag");
                     continueAward.remove("continue_sign");
                     continueAward.remove("continue_tag");
                     continueAward.remove("receive_limit");
@@ -157,11 +157,11 @@ export class MemberSignServiceImplService {
                     continueAwardVar.put("memo", "连签奖励");
                     this.coreMemberService.memberGiftGrant(param.siteId(), param.memberId(), continueAward, continueAwardVar);
     
-                    model.setContinueAward(continueAward.toString());
+                    model.continueAward = continueAward.toString();
                     memberSignMapper.updateById(model);
     
-                    vo.setInfo("连签" + days.toString() + "天恭喜您获得以下奖励");
-                    vo.setAwards(this.coreMemberService.getGiftContent(param.siteId(), continueAward, "member_sign"));
+                    vo.info = "连签" + days.toString( + "天恭喜您获得以下奖励");
+                    vo.awards = this.coreMemberService.getGiftContent(param.siteId(, continueAward, "member_sign"));
                 }
             }
     
@@ -176,7 +176,7 @@ export class MemberSignServiceImplService {
             const days: number[] = [];
             const period: MemberSignMonthRecordVo.Period[] = [];
     
-            const date: Date = DateUtil.parse(param.getYear() + "-" + param.getMonth() + "-1");
+            const date: Date = DateUtil.parse(param.year + "-" + param.month + "-1");
     
             const signRecord: MemberSign[] = this.this.memberSignRepository.find({ /* TODO: 将QueryWrapper改为where条件 */ }))
                     .between("create_time",
@@ -190,8 +190,8 @@ export class MemberSignServiceImplService {
                 }
             }
     
-            vo.setDays(days);
-            vo.setPeriod(period);
+            vo.days = days;
+            vo.period = period;
             return vo;
   }
 
@@ -209,14 +209,14 @@ export class MemberSignServiceImplService {
     const config: Record<string, any> = this.coreConfigService.getConfigValue(this.requestContext.siteId, "SIGN_CONFIG");
             const signConfig: MemberSignConfigVo = Object.assign(new MemberSignConfigVo(), config) /* TODO: 检查MemberSignConfigVo构造函数 */;
     
-            if (!signConfig.getDayAward().isEmpty()) {
-                signConfig.setDayAward(this.coreMemberService.getGiftContent(this.requestContext.siteId, signConfig.getDayAward(), "member_sign"));
+            if (!signConfig.dayAward.isEmpty()) {
+                signConfig.dayAward = this.coreMemberService.getGiftContent(this.requestContext.siteId, signConfig.dayAward, "member_sign");
             }
-            if (!signConfig.getContinueAward().isEmpty()) {
+            if (!signConfig.continueAward.isEmpty()) {
                 const continueAward: JSONArray = new JSONArray();
-                for (const i of number = 0; i < signConfig.getContinueAward().size(); i++) {
+                for (const i of number = 0; i < signConfig.continueAward.size(); i++) {
                     const awardItem: Record<string, any> = new Record<string, any>();
-                    const item: Record<string, any> = signConfig.getContinueAward().getRecord<string, any>(i);
+                    const item: Record<string, any> = signConfig.continueAward.getRecord<string, any>(i);
                     awardItem.set("continue_sign", item.get("continue_sign"));
     
                     item.remove("continue_sign");
@@ -244,19 +244,19 @@ export class MemberSignServiceImplService {
                     awardItem.set("gift", new Record<string, any>().set("total", gift));
                     continueAward.push(awardItem);
                 }
-                signConfig.setContinueAward(continueAward);
+                signConfig.continueAward = continueAward;
             }
     
             // 获取今天的签到
-            const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatTodayString());
-            signConfig.setIsSign(todayMemberSign == null ? false : true);
+            const todayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatTodayString);
+            signConfig.isSign = todayMemberSign == null ? false : true;
     
             // 获取昨天的签到
-            const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.getFormatYesterdayString());
+            const yesterdayMemberSign: MemberSign = this.queryMemberSign(param.siteId(), param.memberId(), DateUtils.formatYesterdayString);
             if (todayMemberSign == null) {
-                signConfig.setDays(yesterdayMemberSign == null ? 0 : yesterdayMemberSign.getDays());
+                signConfig.days = yesterdayMemberSign == null ? 0 : yesterdayMemberSign.days;
             } else {
-                signConfig.setDays(todayMemberSign.getDays());
+                signConfig.days = todayMemberSign.days;
             }
             return signConfig;
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/pay/impl/pay-service-impl.service.ts

@@ -19,16 +19,16 @@ export class PayServiceImplService {
    */
   async pay(param: PayParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setChannel(RequestUtils.channel());
-            param.setBuyerId(this.requestContext.memberId);
+            param.channel = RequestUtils.channel();
+            param.buyerId = this.requestContext.memberId;
     
-            if (RequestUtils.channel() === ChannelEnum.WECHAT.getCode() && param.getOpenid().isEmpty()) {
+            if (RequestUtils.channel() === ChannelEnum.WECHAT.code && param.openid.isEmpty()) {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId));
-                param.setOpenid(ObjectUtil.defaultIfNull(member.getWxOpenid(), ""));
+                param.openid = ObjectUtil.defaultIfNull(member.wxOpenid, "");
             }
-            if (RequestUtils.channel() === ChannelEnum.WEAPP.getCode() && param.getOpenid().isEmpty()) {
+            if (RequestUtils.channel() === ChannelEnum.WEAPP.code && param.openid.isEmpty()) {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ }).eq("site_id", param.siteId).eq("member_id", this.requestContext.memberId));
-                param.setOpenid(ObjectUtil.defaultIfNull(member.getWeappOpenid(), ""));
+                param.openid = ObjectUtil.defaultIfNull(member.weappOpenid, "");
             }
     
             return this.corePayService.pay(param);
@@ -67,24 +67,24 @@ export class PayServiceImplService {
     
             const vo: FriendspayInfoVo = new FriendspayInfoVo();
             BeanUtil.copyProperties(payInfo, vo);
-            vo.setConfig(payInfo.config);
-            vo.setPayTypeList(payInfo.getPayTypeList());
+            vo.config = payInfo.config;
+            vo.payTypeList = payInfo.payTypeList;
             vo.createTime = DateUtils.timestampToString(payInfo.createTime);
-            if (payInfo.getPayTime() != 0) {
-                vo.setPayTime(DateUtils.timestampToString(payInfo.getPayTime()));
+            if (payInfo.payTime != 0) {
+                vo.payTime = DateUtils.timestampToString(payInfo.payTime);
             }
     
-            if (payInfo.getCancelTime() != 0) {
-                vo.setCancelTime(DateUtils.timestampToString(payInfo.getCancelTime()));
+            if (payInfo.cancelTime != 0) {
+                vo.cancelTime = DateUtils.timestampToString(payInfo.cancelTime);
             }
     
             PayTradeInfoDefiner.const event: PayTradeInfoEvent = new PayTradeInfoDefiner.PayTradeInfoEvent(tradeType, tradeId);
             const trades: PayTradeInfoDefiner.PayTradeInfoEventResult[] = EventAndSubscribeOfPublisher.publishAndCallback(event);
             if (CommonUtils.isNotEmpty(trades)) {
-                vo.setTradeInfo(trades.get(0).getJsonObject());
+                vo.tradeInfo = trades.get(0.getJsonObject());
             }
     
-            vo.setSelf(payInfo.getMainId() === this.requestContext.memberId);
+            vo.self = payInfo.mainId === this.requestContext.memberId;
     
             any /* TODO: QueryWrapper<SysPoster> */ posterQueryWrapper = new QueryWrapper();
             posterQueryWrapper.eq("site_id", this.requestContext.siteId)
@@ -93,11 +93,11 @@ export class PayServiceImplService {
                     .eq("is_default", 1);
             const sysPoster: SysPoster = this.sysPosterRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
             if (CommonUtils.isNotEmpty(sysPoster)) {
-                vo.setPosterId(sysPoster.id);
+                vo.posterId = sysPoster.id;
             }
     
-            const member: Member = memberMapper.selectById(payInfo.getMainId());
-            vo.setMember(member);
+            const member: Member = memberMapper.selectById(payInfo.mainId);
+            vo.member = member;
             return vo;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-area-service-impl.service.ts

@@ -20,7 +20,7 @@ export class SysAreaServiceImplService {
    */
   async getAreaById(id: number): Promise<any> {
     // 缓存分组名称
-            const group: string = SysArea.class.getSimpleName();
+            const group: string = SysArea.class.simpleName;
             // 缓存Key值计算参数
             const paramList: Object[] = [id];
             // 自动缓存
@@ -36,7 +36,7 @@ export class SysAreaServiceImplService {
    */
   async getListByPid(pid: number): Promise<any> {
     // 缓存分组名称
-            const group: string = SysAreaListVo.class.getSimpleName();
+            const group: string = SysAreaListVo.class.simpleName;
             // 缓存Key值计算参数
             const paramList: Object[] = [pid];
             // 自动缓存
@@ -97,20 +97,20 @@ export class SysAreaServiceImplService {
     const sysArea: SysArea = this.sysAreaMapper.selectById(code);
             const jsonObject: Record<string, any> = new Record<string, any>();
             if (sysArea != null) {
-                if (sysArea.getLevel() == 1) {
+                if (sysArea.level == 1) {
                     jsonObject.putOpt("province", convertJsonObject(sysArea));
-                } else if (sysArea.getLevel() == 2) {
+                } else if (sysArea.level == 2) {
                     jsonObject.putOpt("city", convertJsonObject(sysArea));
-                    const provinceSysArea: SysArea = this.sysAreaMapper.selectById(sysArea.getPid());
+                    const provinceSysArea: SysArea = this.sysAreaMapper.selectById(sysArea.pid);
                     if (provinceSysArea != null) {
                         jsonObject.putOpt("province", convertJsonObject(provinceSysArea));
                     }
-                } else if (sysArea.getLevel() == 3) {
+                } else if (sysArea.level == 3) {
                     jsonObject.putOpt("district", convertJsonObject(sysArea));
-                    const citySysArea: SysArea = this.sysAreaMapper.selectById(sysArea.getPid());
+                    const citySysArea: SysArea = this.sysAreaMapper.selectById(sysArea.pid);
                     if (citySysArea != null) {
                         jsonObject.putOpt("city", convertJsonObject(citySysArea));
-                        const provinceSysArea: SysArea = this.sysAreaMapper.selectById(citySysArea.getPid());
+                        const provinceSysArea: SysArea = this.sysAreaMapper.selectById(citySysArea.pid);
                         if (provinceSysArea != null) {
                             jsonObject.putOpt("province", convertJsonObject(provinceSysArea));
                         }
@@ -126,7 +126,7 @@ export class SysAreaServiceImplService {
   async getAddressByLatlng(param: SysAreaAddressByLatlngParam): Promise<any> {
     const sysMapVo: SysMapVo = this.coreSysConfigService.getMap(param.siteId());
             const key: string = sysMapVo.key;
-            const addressJsonString: string = TencentGeocoder.getAddress(key, param.getLatlng(), param.getGetPoi());
+            const addressJsonString: string = TencentGeocoder.getAddress(key, param.latlng, param.getPoi);
             const jsonObjectResult: Record<string, any> = TencentGeocoder.formatData(addressJsonString);
             const province: string = jsonObjectResult.getStr("province");
             jsonObjectResult.putOpt("province_id", this.queryCodeByNameAndLevel(province, 1));

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/sys-verify-service-impl.service.ts

@@ -30,9 +30,9 @@ export class SysVerifyServiceImplService {
             const sysVerifyGetCodeVoList: SysVerifyGetCodeVo[] = [];
             for (const verifyCode of verifyCodeList) {
                 const sysVerifyGetCodeVo: SysVerifyGetCodeVo = new SysVerifyGetCodeVo();
-                sysVerifyGetCodeVo.setCode(verifyCode);
-                sysVerifyGetCodeVo.setQrcode(QrcodeUtils.qrcode(param.siteId(), "h5", verifyCode, "", null));
-                if (param.getNeedBarcode() == 1){
+                sysVerifyGetCodeVo.code = verifyCode;
+                sysVerifyGetCodeVo.qrcode = QrcodeUtils.qrcode(param.siteId(, "h5", verifyCode, "", null));
+                if (param.needBarcode == 1){
                     const barcode: string = null;
                     try {
                         const qrcodeDir: string = this.appConfig.webRootDownResource + "upload/temp/";
@@ -42,7 +42,7 @@ export class SysVerifyServiceImplService {
                         log.error("条形码生成失败:{}", e.message, e);
                         throw new BadRequestException("条形码生成失败");
                     }
-                    sysVerifyGetCodeVo.setBarcode(barcode);
+                    sysVerifyGetCodeVo.barcode = barcode;
                 }
                 sysVerifyGetCodeVoList.push(sysVerifyGetCodeVo);
             }
@@ -70,8 +70,8 @@ export class SysVerifyServiceImplService {
             queryWrapper.eq("site_id", param.siteId());
             queryWrapper.eq("verifier_member_id", param.memberId());
     
-            if (StrUtil.isNotEmpty(param.getCode())) {
-                queryWrapper.eq("code", param.getCode());
+            if (StrUtil.isNotEmpty(param.code)) {
+                queryWrapper.eq("code", param.code);
             }
             if (StrUtil.isNotEmpty(param.type)) {
                 queryWrapper.eq("type", param.type);
@@ -79,8 +79,8 @@ export class SysVerifyServiceImplService {
             if (CommonUtils.isNotEmpty(param.createTime)) {
                 QueryMapperUtils.buildByTime(queryWrapper, "create_time", param.createTime);
             }
-            if (StrUtil.isNotEmpty(param.getRelateTag())) {
-                queryWrapper.eq("relate_tag", param.getRelateTag());
+            if (StrUtil.isNotEmpty(param.relateTag)) {
+                queryWrapper.eq("relate_tag", param.relateTag);
             }
             if (StrUtil.isNotEmpty(param.keyword)) {
                 queryWrapper.eq("keyword", param.keyword);
@@ -101,11 +101,11 @@ export class SysVerifyServiceImplService {
                 // 先将数据分组，然后放入结果集
                 const memberMap: Record<number, Member> = ObjectGroupUtils.group(memberList, "memberId");
                 dataList.forEach(bean => {
-                    const member: Member = memberMap.get(bean.getVerifierMemberId());
+                    const member: Member = memberMap.get(bean.verifierMemberId);
                     if (member != null) {
                         const membervo: MemberBriefInfoVo = new MemberBriefInfoVo();
                         Object.assign(membervo, member);
-                        bean.setMember(membervo);
+                        bean.member = membervo;
                     }
                 });
             }
@@ -120,7 +120,7 @@ export class SysVerifyServiceImplService {
             const limit: number = pageParam.limit;
             MPJany /* TODO: QueryWrapper<Member> */ mpjQueryWrapper = new MPJQueryWrapper();
             mpjQueryWrapper.select("t.*");
-            mpjQueryWrapper.setAlias("t");
+            mpjQueryWrapper.alias = "t";
             mpjQueryWrapper.innerJoin("?_site_group nsg ON ns.group_id = nsg.group_id");
             mpjQueryWrapper.eq("site_id", param.siteId());
             mpjQueryWrapper.eq("verifier_member_id", param.memberId());
@@ -135,7 +135,7 @@ export class SysVerifyServiceImplService {
     any /* TODO: QueryWrapper<Verify> */ verifyQueryWrapper = new QueryWrapper();
             verifyQueryWrapper.eq("site_id", param.siteId());
             verifyQueryWrapper.eq("verifier_member_id", param.memberId());
-            verifyQueryWrapper.eq("code", param.getCode());
+            verifyQueryWrapper.eq("code", param.code);
             const verify: Verify = this.this.verifyRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ });
             const sysVerifyDetailVo: SysVerifyDetailVo = new SysVerifyDetailVo();
             if (verify != null) {
@@ -147,7 +147,7 @@ export class SysVerifyServiceImplService {
                 if (member != null) {
                     const membervo: MemberBriefInfoVo = new MemberBriefInfoVo();
                     Object.assign(membervo, member);
-                    sysVerifyDetailVo.setMember(membervo);
+                    sysVerifyDetailVo.member = membervo;
                 }
             }
     
@@ -183,7 +183,7 @@ export class SysVerifyServiceImplService {
    */
   async verifyCode(param: SysVerifyCodeParam): Promise<any> {
     // 1、获取核销码数据
-            const verifyMap: Record<String, Object> = this.getCodeData(param.getCode());
+            const verifyMap: Record<String, Object> = this.getCodeData(param.code);
             // 检测站点数据
             if (verifyMap.get("site_id") == null || !verifyMap.get("site_id").equals(param.siteId())) {
                 // 核销码已过期
@@ -200,7 +200,7 @@ export class SysVerifyServiceImplService {
             // 核销操作
             const verifyDataMap: Record<String, Object> = {};
             verifyDataMap.put("site_id", verifyMap.get("site_id"));
-            verifyDataMap.put("code", param.getCode());
+            verifyDataMap.put("code", param.code);
             verifyDataMap.put("body", verifyMap.get("body"));
             verifyDataMap.put("data", verifyMap.get("data"));
             verifyDataMap.put("value", verifyMap.get("value"));
@@ -221,7 +221,7 @@ export class SysVerifyServiceImplService {
             this.verifyRepository.save(model);
     
             // 核销码失效
-            this.clearCode(param.getCode());
+            this.clearCode(param.code);
             return true;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/sys/impl/upload-service-impl.service.ts

@@ -16,9 +16,9 @@ export class UploadServiceImplService {
    */
   async image(param: AttachmentUploadParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setIsAttachment(0);
-            param.setAttType("image");
-            param.setDir("attachment/image/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/");
+            param.isAttachment = 0;
+            param.attType = "image";
+            param.dir = "attachment/image/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
             return this.coreUploadService.upload(param);
   }
 
@@ -27,9 +27,9 @@ export class UploadServiceImplService {
    */
   async video(param: AttachmentUploadParam): Promise<any> {
     param.siteId = this.requestContext.siteId;
-            param.setIsAttachment(0);
-            param.setAttType("video");
-            param.setDir("attachment/video/" + param.siteId + "/" + DateFormatUtils.getUploadFormat() + "/");
+            param.isAttachment = 0;
+            param.attType = "video";
+            param.dir = "attachment/video/" + param.siteId + "/" + DateFormatUtils.uploadFormat + "/";
             return this.coreUploadService.upload(param);
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/serve-service-impl.service.ts

@@ -17,7 +17,7 @@ export class ServeServiceImplService {
    * service
    */
   async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> {
-    response.setContentType("text/html;charset=utf-8");
+    response.contentType = "text/html;charset=utf-8";
             response.status = HttpServletResponse.SC_OK;
     
             try {
@@ -27,14 +27,14 @@ export class ServeServiceImplService {
     
                 const wxMaService: WxMaService = WechatUtils.miniapp(this.requestContext.siteId);
                 if (!this.wxMaService.checkSignature(timestamp, nonce, signature)) {
-                    response.getWriter().println("非法请求");
+                    response.writer.println("非法请求");
                     return;
                 }
     
                 // 说明是一个仅仅用来验证的请求，回显echostr
                 const echostr: string = request.getParameter("echostr");
                 if (StringUtils.isNotBlank(echostr)) {
-                    response.getWriter().println(echostr);
+                    response.writer.println(echostr);
                     return;
                 }
     
@@ -44,22 +44,22 @@ export class ServeServiceImplService {
     
                 if ("raw".equals(encryptType)) {
                     // 明文传输的消息
-                    inMessage = inMessage.fromXml(request.getInputStream());
+                    inMessage = inMessage.fromXml(request.inputStream);
                 } else if ("aes".equals(encryptType)) {
                     // 是aes加密的消息
                     const msgSignature: string = request.getParameter("msg_signature");
-                    inMessage = WxMaMessage.fromEncryptedXml(request.getInputStream(), this.wxMaService.getWxMaConfig(), timestamp, nonce, msgSignature);
+                    inMessage = WxMaMessage.fromEncryptedXml(request.inputStream, this.wxMaService.wxMaConfig, timestamp, nonce, msgSignature);
                 } else {
-                    response.getWriter().println("不可识别的加密类型");
+                    response.writer.println("不可识别的加密类型");
                     return;
                 }
     
                 const outMessage: WxMaXmlOutMessage = this.message(inMessage);
                 if (outMessage != null) {
                     if ("raw".equals(encryptType)) {
-                        response.getWriter().write(outMessage.toXml());
+                        response.writer.write(outMessage.toXml());
                     } else if ("aes".equals(encryptType)) {
-                        response.getWriter().write(outMessage.toEncryptedXml(this.wxMaService.getWxMaConfig()));
+                        response.writer.write(outMessage.toEncryptedXml(this.wxMaService.wxMaConfig));
                     }
                     return;
                 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/weapp/impl/weapp-service-impl.service.ts

@@ -17,14 +17,14 @@ export class WeappServiceImplService {
    */
   async loginByCode(param: WechatAuthParam): Promise<any> {
     try {
-                const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.getCode());
+                const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.code);
     
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(member)) {
                     const vo: LoginVo = this.loginService.login(member);
                     return vo;
                 }
-                if (CommonUtils.isNotEmpty(wxUser.getUnionid())) {
+                if (CommonUtils.isNotEmpty(wxUser.unionid)) {
                     const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                     if (ObjectUtil.isNotNull(unionidMember)) {
                         const vo: LoginVo = this.loginService.login(unionidMember);
@@ -33,32 +33,32 @@ export class WeappServiceImplService {
                 }
     
                 const loginVo: LoginVo = new LoginVo();
-                loginVo.setOpenid(wxUser.getOpenid());
-                loginVo.setUnionid(ObjectUtil.defaultIfNull(wxUser.getUnionid(), ""));
+                loginVo.openid = wxUser.openid;
+                loginVo.unionid = ObjectUtil.defaultIfNull(wxUser.unionid, "");
     
                 const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
     
                 const registerParam: AuthRegisterParam = new AuthRegisterParam();
-                registerParam.setOpenid(wxUser.getOpenid());
-                registerParam.setUnionid(ObjectUtil.defaultIfNull(wxUser.getUnionid(), ""));
-                registerParam.setPid(param.getPid());
-                registerParam.setHeadimg(param.getHeadimg());
-                registerParam.setNickname(param.getNickname());
-                registerParam.setMobile(param.getMobile());
-                registerParam.setMobileCode(param.getMobileCode());
+                registerParam.openid = wxUser.openid;
+                registerParam.unionid = ObjectUtil.defaultIfNull(wxUser.unionid, "");
+                registerParam.pid = param.pid;
+                registerParam.headimg = param.headimg;
+                registerParam.nickname = param.nickname;
+                registerParam.mobile = param.mobile;
+                registerParam.mobileCode = param.mobileCode;
     
                 // 开启自动注册会员
-                if (config.getIsAuthRegister() == 1) {
-                    if (config.getIsBindMobile() == 1 && config.getIsForceAccessUserInfo() == 1) {
-                        if (CommonUtils.isNotEmpty(param.getMobile()) && CommonUtils.isNotEmpty(param.getHeadimg()) && CommonUtils.isNotEmpty(param.getNickname())) {
+                if (config.isAuthRegister == 1) {
+                    if (config.isBindMobile == 1 && config.isForceAccessUserInfo == 1) {
+                        if (CommonUtils.isNotEmpty(param.mobile) && CommonUtils.isNotEmpty(param.headimg) && CommonUtils.isNotEmpty(param.nickname)) {
                             return this.register(registerParam);
                         }
-                    } else if (config.getIsForceAccessUserInfo() == 1) {
-                        if (CommonUtils.isNotEmpty(param.getHeadimg()) && CommonUtils.isNotEmpty(param.getNickname())) {
+                    } else if (config.isForceAccessUserInfo == 1) {
+                        if (CommonUtils.isNotEmpty(param.headimg) && CommonUtils.isNotEmpty(param.nickname)) {
                             return this.register(registerParam);
                         }
-                    } else if (config.getIsBindMobile() == 1) {
-                        if (CommonUtils.isNotEmpty(param.getMobile()) || CommonUtils.isNotEmpty(param.getMobileCode())) {
+                    } else if (config.isBindMobile == 1) {
+                        if (CommonUtils.isNotEmpty(param.mobile) || CommonUtils.isNotEmpty(param.mobileCode)) {
                             return this.register(registerParam);
                         }
                     } else {
@@ -66,8 +66,8 @@ export class WeappServiceImplService {
                     }
                 } else {
                     // 关闭自动注册，但是开启了强制绑定手机号，必须获取手机号才能进行注册
-                    if (config.getIsBindMobile() == 1 || config.getIsMobile() == 1) {
-                        if (CommonUtils.isNotEmpty(param.getMobile()) || CommonUtils.isNotEmpty(param.getMobileCode())) {
+                    if (config.isBindMobile == 1 || config.isMobile == 1) {
+                        if (CommonUtils.isNotEmpty(param.mobile) || CommonUtils.isNotEmpty(param.mobileCode)) {
                             return this.register(registerParam);
                         }
                     }
@@ -83,22 +83,22 @@ export class WeappServiceImplService {
    * register
    */
   async register(param: AuthRegisterParam): Promise<any> {
-    if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空");
+    if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
             try {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
     
-                if (!param.getUnionid().isEmpty()) {
+                if (!param.unionid.isEmpty()) {
                     const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                     if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
                 }
     
                 const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
-                if (config.getIsBindMobile() == 1) {
-                    if (!param.getMobile().isEmpty() || !param.getMobileCode().isEmpty()) {
-                        if (!param.getMobileCode().isEmpty()) {
-                            const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.getMobileCode());
-                            param.setMobile(phoneInfo.getPurePhoneNumber());
+                if (config.isBindMobile == 1) {
+                    if (!param.mobile.isEmpty() || !param.mobileCode.isEmpty()) {
+                        if (!param.mobileCode.isEmpty()) {
+                            const phoneInfo: WxMaPhoneNumberInfo = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getPhoneNoInfo(param.mobileCode);
+                            param.mobile = phoneInfo.purePhoneNumber;
                         }
                     } else {
                         throw new BadRequestException("手机号不能为空");
@@ -106,12 +106,12 @@ export class WeappServiceImplService {
                 }
     
                 const registerMember: Member = new Member();
-                registerMember.setWeappOpenid(param.getOpenid());
-                registerMember.setMobile(param.getMobile());
-                registerMember.setWxUnionid(param.getUnionid());
-                registerMember.setPid(param.getPid());
-                registerMember.setNickname(param.getNickname());
-                registerMember.setHeadimg(param.getHeadimg());
+                registerMember.weappOpenid = param.openid;
+                registerMember.mobile = param.mobile;
+                registerMember.wxUnionid = param.unionid;
+                registerMember.pid = param.pid;
+                registerMember.nickname = param.nickname;
+                registerMember.headimg = param.headimg;
                 return this.registerService.register(registerMember);
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -123,14 +123,14 @@ export class WeappServiceImplService {
    */
   async updateOpenid(param: WechatAuthParam): Promise<any> {
     try {
-                const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.getCode());
+                const wxUser: WxMaJscode2SessionResult = WechatUtils.miniapp(this.requestContext.siteId).getUserService().getSessionInfo(param.code);
     
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
     
                 const updateMember: Member = new Member();
                 updateMember.memberId = this.requestContext.memberId;
-                updateMember.setWxOpenid(wxUser.getOpenid());
+                updateMember.wxOpenid = wxUser.openid;
                 this.memberMapper.updateById(updateMember);
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -146,7 +146,7 @@ export class WeappServiceImplService {
                     .eq("is_weapp", 1)
                     .eq("site_id", this.requestContext.siteId)
                     .ne("weapp_template_id", "")
-            ).stream().map(item => item.getWeappTemplateId());
+            ).stream().map(item => item.weappTemplateId);
   }
 
   /**

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/serve-service-impl.service.ts

@@ -17,7 +17,7 @@ export class ServeServiceImplService {
    * service
    */
   async service(request: HttpServletRequest, response: HttpServletResponse): Promise<any> {
-    response.setContentType("text/html;charset=utf-8");
+    response.contentType = "text/html;charset=utf-8";
             response.status = HttpServletResponse.SC_OK;
     
             try {
@@ -28,14 +28,14 @@ export class ServeServiceImplService {
                 // 消息签名不正确，说明不是公众平台发过来的消息
                 const wxMpService: WxMpService = WechatUtils.mp(this.requestContext.siteId);
                 if (!this.wxMpService.checkSignature(timestamp, nonce, signature)) {
-                    response.getWriter().println("非法请求");
+                    response.writer.println("非法请求");
                     return;
                 }
     
                 // 说明是一个仅仅用来验证的请求，回显echostr
                 const echostr: string = request.getParameter("echostr");
                 if (StringUtils.isNotBlank(echostr)) {
-                    response.getWriter().println(echostr);
+                    response.writer.println(echostr);
                     return;
                 }
     
@@ -45,22 +45,22 @@ export class ServeServiceImplService {
     
                 if ("raw".equals(encryptType)) {
                     // 明文传输的消息
-                    inMessage = WxMpXmlMessage.fromXml(request.getInputStream());
+                    inMessage = WxMpXmlMessage.fromXml(request.inputStream);
                 } else if ("aes".equals(encryptType)) {
                     // 是aes加密的消息
                     const msgSignature: string = request.getParameter("msg_signature");
-                    inMessage = WxMpXmlMessage.fromEncryptedXml(request.getInputStream(), this.wxMpService.getWxMpConfigStorage(), timestamp, nonce, msgSignature);
+                    inMessage = WxMpXmlMessage.fromEncryptedXml(request.inputStream, this.wxMpService.wxMpConfigStorage, timestamp, nonce, msgSignature);
                 } else {
-                    response.getWriter().println("不可识别的加密类型");
+                    response.writer.println("不可识别的加密类型");
                     return;
                 }
     
                 const outMessage: WxMpXmlOutMessage = this.message(inMessage);
                 if (outMessage != null) {
                     if ("raw".equals(encryptType)) {
-                        response.getWriter().write(outMessage.toXml());
+                        response.writer.write(outMessage.toXml());
                     } else if ("aes".equals(encryptType)) {
-                        response.getWriter().write(outMessage.toEncryptedXml(this.wxMpService.getWxMpConfigStorage()));
+                        response.writer.write(outMessage.toEncryptedXml(this.wxMpService.wxMpConfigStorage));
                     }
                     return;
                 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/api/wechat/impl/wechat-service-impl.service.ts

@@ -37,15 +37,15 @@ export class WechatServiceImplService {
    */
   async loginByCode(param: WechatAuthParam): Promise<any> {
     try {
-                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode());
+                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
                 const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
     
                 return this.login(
-                        ObjectUtil.defaultIfNull(wxUser.getOpenid(), ""),
-                        ObjectUtil.defaultIfNull(wxUser.getUnionId(), ""),
-                        ObjectUtil.defaultIfNull(wxUser.getNickname(), ""),
-                        ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""),
-                        param.getPid()
+                        ObjectUtil.defaultIfNull(wxUser.openid, ""),
+                        ObjectUtil.defaultIfNull(wxUser.unionId, ""),
+                        ObjectUtil.defaultIfNull(wxUser.nickname, ""),
+                        ObjectUtil.defaultIfNull(wxUser.headImgUrl, ""),
+                        param.pid
                 );
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -63,7 +63,7 @@ export class WechatServiceImplService {
                     data.getStr("unionid", ""),
                     data.getStr("nickname", ""),
                     data.getStr("avatar", ""),
-                    param.getPid()
+                    param.pid
             );
   }
 
@@ -71,27 +71,27 @@ export class WechatServiceImplService {
    * register
    */
   async register(param: AuthRegisterParam): Promise<any> {
-    if (param.getOpenid().isEmpty()) throw new BadRequestException("openid不能为空");
+    if (param.openid.isEmpty()) throw new BadRequestException("openid不能为空");
             try {
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                 if (ObjectUtil.isNotNull(member)) throw new BadRequestException("账号已存在");
     
-                if (!param.getUnionid().isEmpty()) {
+                if (!param.unionid.isEmpty()) {
                     const unionidMember: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
                     if (ObjectUtil.isNotNull(unionidMember)) throw new BadRequestException("账号已存在");
                 }
     
                 const config: LoginConfigVo = this.coreMemberConfigService.getLoginConfig(this.requestContext.siteId);
-                if (config.getIsBindMobile() == 1) {
-                    if (param.getMobile().isEmpty()) throw new BadRequestException("手机号不能为空");
-                    this.registerService.checkMobileCode(param.getMobile(), param.getMobileKey(), param.getMobileCode());
+                if (config.isBindMobile == 1) {
+                    if (param.mobile.isEmpty()) throw new BadRequestException("手机号不能为空");
+                    this.registerService.checkMobileCode(param.mobile, param.mobileKey, param.mobileCode);
                 }
     
                 const registerMember: Member = new Member();
-                registerMember.setWxOpenid(param.getOpenid());
-                registerMember.setMobile(param.getMobile());
-                registerMember.setWxUnionid(param.getUnionid());
-                registerMember.setPid(param.getPid());
+                registerMember.wxOpenid = param.openid;
+                registerMember.mobile = param.mobile;
+                registerMember.wxUnionid = param.unionid;
+                registerMember.pid = param.pid;
                 return this.registerService.register(registerMember);
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -103,13 +103,13 @@ export class WechatServiceImplService {
    */
   async sync(param: WechatSyncParam): Promise<any> {
     try {
-                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode());
+                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
                 const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
     
                 const member: Member = new Member();
                 member.memberId = this.requestContext.memberId;
-                member.setNickname(ObjectUtil.defaultIfNull(wxUser.getNickname(), ""));
-                member.setHeadimg(ObjectUtil.defaultIfNull(wxUser.getHeadImgUrl(), ""));
+                member.nickname = ObjectUtil.defaultIfNull(wxUser.nickname, "");
+                member.headimg = ObjectUtil.defaultIfNull(wxUser.headImgUrl, "");
                 this.memberMapper.updateById(member);
             } catch (e) {
                 throw new BadRequestException(e.message);
@@ -125,15 +125,15 @@ export class WechatServiceImplService {
     
                 const mp: WxMpService = WechatUtils.mp(this.requestContext.siteId);
     
-                const wxOAuth2AccessToken: WxOAuth2AccessToken = mp.getOAuth2Service().getAccessToken(param.getCode());
-                if (wxOAuth2AccessToken.getScope() === "snsapi_base") {
-                    vo.setOpenid(ObjectUtil.defaultIfNull(wxOAuth2AccessToken.getOpenId(), ""));
+                const wxOAuth2AccessToken: WxOAuth2AccessToken = mp.oAuth2Service.getAccessToken(param.code);
+                if (wxOAuth2AccessToken.scope === "snsapi_base") {
+                    vo.openid = ObjectUtil.defaultIfNull(wxOAuth2AccessToken.openId, "");
                 } else {
-                    const userInfo: WxOAuth2UserInfo = mp.getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
-                    vo.setOpenid(ObjectUtil.defaultIfNull(userInfo.getOpenid(), ""));
-                    vo.setUnionid(ObjectUtil.defaultIfNull(userInfo.getUnionId(), ""));
-                    vo.setNickname(ObjectUtil.defaultIfNull(userInfo.getNickname(), ""));
-                    vo.setAvatar(ObjectUtil.defaultIfNull(userInfo.getHeadImgUrl(), ""));
+                    const userInfo: WxOAuth2UserInfo = mp.oAuth2Service.getUserInfo(wxOAuth2AccessToken, null);
+                    vo.openid = ObjectUtil.defaultIfNull(userInfo.openid, "");
+                    vo.unionid = ObjectUtil.defaultIfNull(userInfo.unionId, "");
+                    vo.nickname = ObjectUtil.defaultIfNull(userInfo.nickname, "");
+                    vo.avatar = ObjectUtil.defaultIfNull(userInfo.headImgUrl, "");
                 }
                 return vo;
             } catch (e) {
@@ -148,7 +148,7 @@ export class WechatServiceImplService {
     try {
                 const key: string = this.coreScanService.scan(this.requestContext.siteId, "wechat_login", new Record<string, any>().set("channel", RequestUtils.channel()), 300);
                 const ticket: WxMpQrCodeTicket = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodeCreateTmpTicket(key, 300);
-                const url: string = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodePictureUrl(ticket.getTicket());
+                const url: string = WechatUtils.mp(this.requestContext.siteId).getQrcodeService().qrCodePictureUrl(ticket.ticket);
     
                 const vo: WechatScanLoginVo = new WechatScanLoginVo();
                 vo.key = key;
@@ -165,7 +165,7 @@ export class WechatServiceImplService {
    */
   async updateOpenid(param: WechatAuthParam): Promise<any> {
     try {
-                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.getCode());
+                const wxOAuth2AccessToken: WxOAuth2AccessToken = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getAccessToken(param.code);
                 const wxUser: WxOAuth2UserInfo = WechatUtils.mp(this.requestContext.siteId).getOAuth2Service().getUserInfo(wxOAuth2AccessToken, null);
     
                 const member: Member = this.memberRepository.findOne({ /* TODO: 将QueryWrapper改为where条件 */ })).eq("site_id", this.requestContext.siteId));
@@ -173,7 +173,7 @@ export class WechatServiceImplService {
     
                 const updateMember: Member = new Member();
                 updateMember.memberId = this.requestContext.memberId;
-                updateMember.setWxOpenid(wxUser.getOpenid());
+                updateMember.wxOpenid = wxUser.openid;
                 this.memberMapper.updateById(updateMember);
             } catch (e) {
                 throw new BadRequestException(e.message);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-install-service-impl.service.ts

@@ -77,7 +77,7 @@ export class CoreAddonInstallServiceImplService {
             if (CommonUtils.isNotEmpty(addonObject)) {
                 throw new BadRequestException("当前插件已安装,不能重复安装");
             }
-            if (CommonUtils.isNotEmpty(this.getInstallTask())) {
+            if (CommonUtils.isNotEmpty(this.installTask)) {
                 throw new BadRequestException("有正在安装中的插件");
             }
             this.installTask.put("mode", mode);
@@ -114,7 +114,7 @@ export class CoreAddonInstallServiceImplService {
    * cancleInstall
    */
   async cancleInstall(): Promise<any> {
-    if (CommonUtils.isNotEmpty(this.getInstallTask())) this.installTask.clear();
+    if (CommonUtils.isNotEmpty(this.installTask)) this.installTask.clear();
             this.installStep.clear();
   }
 
@@ -173,14 +173,14 @@ export class CoreAddonInstallServiceImplService {
             this.installTask.put("addon", addon);
             if (result) {
                 this.installTask.put("status", "success");
-                const tips: string[] = AddonUpgradeHelper.getAddonInfo();
+                const tips: string[] = AddonUpgradeHelper.addonInfo;
                 this.installTask.put("tips", tips);
                 this.installCheck = false;
                 log.warn("安装成功...........................................");
             } else {
                 this.installTask.put("status", "fail");
                 this.installTask.put("failReason", "jar包加载错误.");
-                const tips: string[] = AddonUpgradeHelper.getAddonInfo();
+                const tips: string[] = AddonUpgradeHelper.addonInfo;
                 this.installTask.put("tips", tips);
                 log.warn("执行回滚操作<---------------------begin--------------------->");
                 if (!this.appConfig.runActive.toLowerCase() === "dev".toLowerCase()) {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/addon/impl/core-addon-service-impl.service.ts

@@ -62,7 +62,7 @@ export class CoreAddonServiceImplService {
                 addon.updateTime = Date.now( / 1000);
                 this.addonRepository.save(addon, /* TODO: any /* TODO: QueryWrapper<Addon> */需改写为TypeORM的where条件对象 */.eq("`key`", addon.key));
             } else {
-                addon.setInstallTime(Date.now() / 1000);
+                addon.installTime = Date.now( / 1000);
                 this.addonRepository.save(addon);
             }
   }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/aliapp/impl/core-aliapp-config-service-impl.service.ts

@@ -16,9 +16,9 @@ export class CoreAliappConfigServiceImplService {
   async getAliappConfig(siteId: number): Promise<any> {
     const coreSysConfigVo: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, "aliapp");
             const vo: AliappConfigVo = new AliappConfigVo();
-            if(ObjectUtil.isNotNull(coreSysConfigVo.getValueJson()))
+            if(ObjectUtil.isNotNull(coreSysConfigVo.valueJson))
             {
-                vo = Object.assign(new AliappConfigVo(), coreSysConfigVo.getValueJson()) /* TODO: 检查AliappConfigVo构造函数 */;
+                vo = Object.assign(new AliappConfigVo(), coreSysConfigVo.valueJson) /* TODO: 检查AliappConfigVo构造函数 */;
             }
             return vo;
   }
@@ -28,6 +28,6 @@ export class CoreAliappConfigServiceImplService {
    */
   async setAliappConfig(siteId: number, aliappConfigParam: AliappConfigParam): Promise<any> {
     const json: Record<string, any> = JsonUtils.parseObject<any>(aliappConfigParam);
-            this.coreConfigService.setConfig(siteId, "aliapp", json);
+            this.coreConfigService.config = siteId, "aliapp", json;
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/app/impl/core-queue-service-impl.service.ts

@@ -15,8 +15,8 @@ export class CoreQueueServiceImplService {
    * exec
    */
   async exec(taskArgument: TaskArgument): Promise<any> {
-    console.log("target bean => " + taskArgument.getTargetBean());
-            console.log("target method => " + taskArgument.getTargetMethod());
+    console.log("target bean => " + taskArgument.targetBean);
+            console.log("target method => " + taskArgument.targetMethod);
             console.log("method argument => " + taskArgument);
             console.log("execute time => " + Date.now());
             try {

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/core-captcha-img-service-impl.service.ts

@@ -16,17 +16,17 @@ export class CoreCaptchaImgServiceImplService {
    */
   async create(captchaType: string): Promise<any> {
     const captchaVO: CaptchaVO = new CaptchaVO();
-            captchaVO.setCaptchaType(captchaType);
+            captchaVO.captchaType = captchaType;
             const responseModel: ResponseModel = this.captchaService.get(captchaVO);
             const coreCaptchaInfoVo: CoreCaptchaInfoVo = new CoreCaptchaInfoVo();
             if(responseModel.isSuccess()){
-                const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(responseModel.getRepData());
-                coreCaptchaInfoVo.setToken(jsonObject.getStr("token"));
-                coreCaptchaInfoVo.setJigsawImageBase64(jsonObject.getStr("jigsawImageBase64"));
-                coreCaptchaInfoVo.setOriginalImageBase64(jsonObject.getStr("originalImageBase64"));
-                coreCaptchaInfoVo.setSecretKey(jsonObject.getStr("secretKey"));
+                const jsonObject: Record<string, any> = JsonUtils.parseObject<any>(responseModel.repData);
+                coreCaptchaInfoVo.token = jsonObject.getStr("token");
+                coreCaptchaInfoVo.jigsawImageBase64 = jsonObject.getStr("jigsawImageBase64");
+                coreCaptchaInfoVo.originalImageBase64 = jsonObject.getStr("originalImageBase64");
+                coreCaptchaInfoVo.secretKey = jsonObject.getStr("secretKey");
             }else{
-                throw new UnauthorizedException(responseModel.getRepMsg());
+                throw new UnauthorizedException(responseModel.repMsg);
             }
             return coreCaptchaInfoVo;
   }
@@ -35,16 +35,16 @@ export class CoreCaptchaImgServiceImplService {
    * check
    */
   async check(coreCaptchaValiDateParam: CoreCaptchaValiDateParam): Promise<any> {
-    if(ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaType()) || ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaCode()) || ObjectUtil.isNull(coreCaptchaValiDateParam.getCaptchaKey())){
+    if(ObjectUtil.isNull(coreCaptchaValiDateParam.captchaType) || ObjectUtil.isNull(coreCaptchaValiDateParam.captchaCode) || ObjectUtil.isNull(coreCaptchaValiDateParam.captchaKey)){
                 throw new UnauthorizedException("缺少参数");
             }
             const captchaVO: CaptchaVO = new CaptchaVO();
-            captchaVO.setCaptchaType(coreCaptchaValiDateParam.getCaptchaType());
-            captchaVO.setToken(coreCaptchaValiDateParam.getCaptchaKey());
-            captchaVO.setPointJson(coreCaptchaValiDateParam.getCaptchaCode());
+            captchaVO.captchaType = coreCaptchaValiDateParam.captchaType;
+            captchaVO.token = coreCaptchaValiDateParam.captchaKey;
+            captchaVO.pointJson = coreCaptchaValiDateParam.captchaCode;
             const responseModel: ResponseModel = this.captchaService.check(captchaVO);
             if(!responseModel.isSuccess()){
-                throw new UnauthorizedException(responseModel.getRepMsg());
+                throw new UnauthorizedException(responseModel.repMsg);
             }
             return true;
   }
@@ -55,7 +55,7 @@ export class CoreCaptchaImgServiceImplService {
   async verification(captchaVO: CaptchaVO): Promise<any> {
     const responseModel: ResponseModel = this.captchaService.verification(captchaVO);
             if(!responseModel.isSuccess()){
-                throw new UnauthorizedException(responseModel.getRepMsg());
+                throw new UnauthorizedException(responseModel.repMsg);
             }
   }
 }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/captcha/impl/default-captcha-service-impl.service.ts

@@ -47,7 +47,7 @@ export class DefaultCaptchaServiceImplService {
     if (captchaVO == null) {
                 return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
             } else {
-                return StringUtils.isEmpty(captchaVO.getCaptchaType()) ? RepCodeEnum.NULL_ERROR.parseError("类型") : this.getService(captchaVO.getCaptchaType()).get(captchaVO);
+                return StringUtils.isEmpty(captchaVO.captchaType) ? RepCodeEnum.NULL_ERROR.parseError("类型") : this.getService(captchaVO.captchaType).get(captchaVO);
             }
   }
 
@@ -57,10 +57,10 @@ export class DefaultCaptchaServiceImplService {
   async check(captchaVO: CaptchaVO): Promise<any> {
     if (captchaVO == null) {
                 return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
-            } else if (StringUtils.isEmpty(captchaVO.getCaptchaType())) {
+            } else if (StringUtils.isEmpty(captchaVO.captchaType)) {
                 return RepCodeEnum.NULL_ERROR.parseError("类型");
             } else {
-                return StringUtils.isEmpty(captchaVO.getToken()) ? RepCodeEnum.NULL_ERROR.parseError("token") : this.getService(captchaVO.getCaptchaType()).check(captchaVO);
+                return StringUtils.isEmpty(captchaVO.token) ? RepCodeEnum.NULL_ERROR.parseError("token") : this.getService(captchaVO.captchaType).check(captchaVO);
             }
   }
 
@@ -70,11 +70,11 @@ export class DefaultCaptchaServiceImplService {
   async verification(captchaVO: CaptchaVO): Promise<any> {
     if (captchaVO == null) {
                 return RepCodeEnum.NULL_ERROR.parseError("captchaVO");
-            } else if (StringUtils.isEmpty(captchaVO.getCaptchaVerification())) {
+            } else if (StringUtils.isEmpty(captchaVO.captchaVerification)) {
                 return RepCodeEnum.NULL_ERROR.parseError("二次校验参数");
             } else {
                 try {
-                    const codeKey: string = String.format(REDIS_SECOND_CAPTCHA_KEY, captchaVO.getCaptchaVerification());
+                    const codeKey: string = String.format(REDIS_SECOND_CAPTCHA_KEY, captchaVO.captchaVerification);
                     if (!CaptchaServiceFactory.getCache(cacheType).exists(codeKey)) {
                         return ResponseModel.errorMsg(RepCodeEnum.API_CAPTCHA_INVALID);
                     }

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-cloud-service-impl.service.ts

@@ -22,9 +22,9 @@ export class CoreAppCloudServiceImplService {
     const appConfig: AppConfigVo = this.coreAppService.getConfig(param.siteId);
     
             if (CommonUtils.isEmpty(appConfig.appName)) throw new BadRequestException("请先配置应用名称");
-            if (CommonUtils.isEmpty(appConfig.getUniAppId())) throw new BadRequestException("请先配置应用ID");
-            if (CommonUtils.isEmpty(appConfig.getAndroidAppKey())) throw new BadRequestException("请先配置应用密钥");
-            if (CommonUtils.isEmpty(appConfig.getApplicationId())) throw new BadRequestException("请先配置应用包名");
+            if (CommonUtils.isEmpty(appConfig.uniAppId)) throw new BadRequestException("请先配置应用ID");
+            if (CommonUtils.isEmpty(appConfig.androidAppKey)) throw new BadRequestException("请先配置应用密钥");
+            if (CommonUtils.isEmpty(appConfig.applicationId)) throw new BadRequestException("请先配置应用包名");
     
             const taskKey: string = String(Date.now() / 1000);
     
@@ -40,29 +40,29 @@ export class CoreAppCloudServiceImplService {
     
             const build: Record<string, any> = new Record<string, any>();
             build.set("app_name", appConfig.appName);
-            build.set("uni_app_id", appConfig.getUniAppId());
-            build.set("wechat_app_id", ObjectUtil.defaultIfNull(appConfig.getWechatAppId(), ""));
-            build.set("wechat_app_secret", ObjectUtil.defaultIfNull(appConfig.getWechatAppSecret(), ""));
-            build.set("android_app_key", appConfig.getAndroidAppKey());
-            build.set("application_id", appConfig.getApplicationId());
+            build.set("uni_app_id", appConfig.uniAppId);
+            build.set("wechat_app_id", ObjectUtil.defaultIfNull(appConfig.wechatAppId, ""));
+            build.set("wechat_app_secret", ObjectUtil.defaultIfNull(appConfig.wechatAppSecret, ""));
+            build.set("android_app_key", appConfig.androidAppKey);
+            build.set("application_id", appConfig.applicationId);
             build.set("privacy_agreement", wapUrl + "/app/pages/auth/agreement?key=privacy&=");
             build.set("service_agreement", wapUrl + "/app/pages/auth/agreement?key=service&=");
             build.set("qq_map_key", mapConfig.key);
             build.set("amap_key", "");
-            build.set("version_name", param.getVersionName());
-            build.set("version_code", param.getVersionCode());
-            build.putByPath("cert.type", param.getCert().getType());
-            build.putByPath("cert.file", param.getCert().getFile());
-            build.putByPath("cert.key_alias", param.getCert().getKeyAlias());
-            build.putByPath("cert.key_password", param.getCert().getKeyPassword());
-            build.putByPath("cert.store_password", param.getCert().getStorePassword());
+            build.set("version_name", param.versionName);
+            build.set("version_code", param.versionCode);
+            build.putByPath("cert.type", param.cert.getType());
+            build.putByPath("cert.file", param.cert.getFile());
+            build.putByPath("cert.key_alias", param.cert.getKeyAlias());
+            build.putByPath("cert.key_password", param.cert.getKeyPassword());
+            build.putByPath("cert.store_password", param.cert.getStorePassword());
     
             try {
                 // 写入build.json文件
                 fs.writeFileSync(packageDir, "build.json", build.toString(), "UTF-8");
     
                 // 拷贝证书文件
-                if (param.getCert().getType() === "private"){
+                if (param.cert.getType() === "private"){
                     const certFile: string = this.appConfig.webRootDownResource, param.getCert(.getFile());
                     if (!fs.existsSync(certFile)) throw new BadRequestException("证书文件不存在");
     
@@ -77,14 +77,14 @@ export class CoreAppCloudServiceImplService {
                 // 将临时目录下文件生成压缩包
                 const zipFile: string = ZipUtil.zip(packageDir, tempDir + "app.zip");
     
-                const instance: NiucloudUtils = NiucloudUtils.getInstance();
+                const instance: NiucloudUtils = NiucloudUtils.instance;
     
                 const actionQuery: Record<String, Object> = new const query: Record<>();
-                actionQuery.put("data[product_key]", instance.getProductKey());
+                actionQuery.put("data[product_key]", instance.productKey);
                 const actionToken: Record<string, any> = this.niucloudService.getActionToken("appbuild", actionQuery);
     
                 Record<String, Object> = {};
-                query.put("authorize_code", instance.getCode());
+                query.put("authorize_code", instance.code);
                 query.put("timestamp", taskKey);
                 query.put("token", actionToken == null ? "" : actionToken.getStr("token"));
     
@@ -108,17 +108,17 @@ export class CoreAppCloudServiceImplService {
    * getAppCompileLog
    */
   async getAppCompileLog(key: string): Promise<any> {
-    const instance: NiucloudUtils = NiucloudUtils.getInstance();
+    const instance: NiucloudUtils = NiucloudUtils.instance;
     
             const query: Record<String, Object> = {};
-            query.put("authorize_code", instance.getCode());
+            query.put("authorize_code", instance.code);
             query.put("timestamp", key);
     
             const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/get_appbuild_logs").query(query).method(Method.GET).execute();
             try {
                 const vo: AppCompileLogVo = new AppCompileLogVo();
                 const log: Record<string, any> = JsonUtils.parseObject<any>(response.body());
-                vo.setBuildLog(log);
+                vo.buildLog = log;
     
                 if (log != null) {
                     const data: JSONArray = ObjectUtil.defaultIfNull(log.getByPath("data.0", JSONArray.class), new JSONArray());
@@ -126,7 +126,7 @@ export class CoreAppCloudServiceImplService {
                         const last: Record<string, any> = data.getRecord<string, any>(data.length - 1);
                         if (last.getInt("code", -1).equals(0)) {
                             vo.status = "fail";
-                            vo.setFailReason(last.getStr("msg", ""));
+                            vo.failReason = last.getStr("msg", "");
                             return vo;
                         }
                         if (last.getInt("percent", 0).equals(100)) {
@@ -146,11 +146,11 @@ export class CoreAppCloudServiceImplService {
    */
   async generateSignCert(param: GenerateSignCertParam): Promise<any> {
     const query: Record<String, Object> = {};
-            query.put("key_alias", param.getKeyAlias());
-            query.put("key_password", param.getKeyPassword());
-            query.put("store_password", param.getStorePassword());
+            query.put("key_alias", param.keyAlias);
+            query.put("key_password", param.keyPassword);
+            query.put("store_password", param.storePassword);
             query.put("limit", param.limit);
-            query.put("dname", "CN=" + param.getCn() + ", OU=" + param.getOu() + ", O=" + param.getO() + ", L=" + param.getL() + ", ST=" + param.getSt() + ", C=" + param.getC());
+            query.put("dname", "CN=" + param.cn + ", OU=" + param.ou + ", O=" + param.o + ", L=" + param.l + ", ST=" + param.st + ", C=" + param.c);
     
             const response: HttpResponse = new NiucloudUtils.Cloud().build("cloud/getcert").query(query).method(Method.GET).execute();
     
@@ -168,7 +168,7 @@ export class CoreAppCloudServiceImplService {
                 const file: string = tempDir + param.getKeyAlias( + ".zip");
                 const fos: FileOutputStream = new FileOutputStream(file, true);
                 fos.write(response.bodyBytes());
-                return "upload/download/cert/" + param.getKeyAlias() + ".zip";
+                return "upload/download/cert/" + param.keyAlias + ".zip";
             } catch (e) {
                 console.error(e);
                 throw new BadRequestException(e.message);

wwjcloud-nest-v1/wwjcloud/libs/wwjcloud-core/src/services/core/channel/impl/core-app-service-impl.service.ts

@@ -16,16 +16,16 @@ export class CoreAppServiceImplService {
    */
   async getConfig(siteId: number): Promise<any> {
     const config: CoreSysConfigVo = this.coreConfigService.getConfig(siteId, ConfigKeyEnum.path.basename(APP));
-            if (config == null || config.getValueJson() == null) {
+            if (config == null || config.valueJson == null) {
                 return new AppConfigVo();
             }
-            return Object.assign(new AppConfigVo(), config.getValueJson()) /* TODO: 检查AppConfigVo构造函数 */;
+            return Object.assign(new AppConfigVo(), config.valueJson) /* TODO: 检查AppConfigVo构造函数 */;
   }
 
   /**
    * setConfig
    */
   async setConfig(siteId: number, param: SetAppParam): Promise<any> {
-    this.coreConfigService.setConfig(siteId, ConfigKeyEnum.path.basename(APP), JsonUtils.parseObject<any>(param));
+    this.coreConfigService.config = siteId, ConfigKeyEnum.path.basename(APP, JsonUtils.parseObject<any>(param));
   }
 }