Merge remote-tracking branch 'origin/master'

k94314517

2024-05-06 18ac8ef5bf5767ccf1626d2d8e0b0aa907f49325

Merge remote-tracking branch 'origin/master'

 h5/pages/userinfo/userinfo.vue

@@ -198,7 +198,7 @@
                that.$refs.cropper.close()
                uni.showLoading({ title: '上传中', mask: true });
                uni.uploadFile({
                    url: `${this.$baseUrl}visitsAdmin/cloudService/web/visit/public/uploadFtp.do`,
                    url: `${this.$baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`,
                    filePath: file.tempFilePath,
                    name: 'file',
                    formData: {
@@ -234,7 +234,7 @@
                        if (type === 'imgurl') {
                            uni.showLoading({ title: '上传中', mask: true });
                            uni.uploadFile({
                                url: `${that.$baseUrl}visitsAdmin/cloudService/web/visit/public/uploadFtp.do`,
                                url: `${that.$baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`,
                                filePath: chooseImageRes.tempFilePaths[0],
                                name: 'file',
                                formData: {

 h5/pages/visitorApplication/visitorApplication.vue

@@ -376,7 +376,7 @@
                this.$refs.cropper.close()
                uni.showLoading({ title: '上传中', mask: true });
                uni.uploadFile({
                    url: `${this.$baseUrl}visitsAdmin/cloudService/web/visit/public/uploadFtp.do`,
                    url: `${this.$baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`,
                    filePath: file.tempFilePath,
                    name: 'file',
                    formData: {
@@ -534,7 +534,7 @@
                        uni.showLoading({ title: '上传中', mask: true });
                        for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
                            uni.uploadFile({
                                url: `${this.$baseUrl}visitsAdmin/cloudService/web/visit/public/uploadFtp.do`,
                                url: `${this.$baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`,
                                filePath: chooseImageRes.tempFilePaths[i],
                                name: 'file',
                                formData: {

 h5/utils/http.api.js

@@ -6,14 +6,14 @@
        return config;
    })
    
    let wxAuthorize = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visit/visitor/wxAuthorize', { params });    // è®¿å®¢å¾®ä¿¡æŽˆæƒ
    let getSystemDictData = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visit/other/getSystemDictData', { params });    // æŸ¥è¯¢å­—典值数据
    let getProblemsVO = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visit/problem/getProblemsVO', { params });    // èŽ·å–题目数据
    let finishAnswer = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/visit/problem/finishAnswer', data);    // ä¿®æ”¹å½“前登录的用户信息
    let deviceRoleList = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visit/other/deviceRoleList', { params });    // è®¾å¤‡ç»„列表
    let getVisitedMember = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/visit/visitor/getVisitedMember', data);    // æŸ¥è¯¢è¢«è®¿é—®äººä¿¡æ¯
    let createFk = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/visit/visitor/createFk', data);    // è®¿å®¢è®°å½•æäº¤
    let detail = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visit/visitor/detail', { params });    // è®¿å®¢è®°å½•è¯¦æƒ…
    let wxAuthorize = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visitor/wxAuthorize', { params });    // è®¿å®¢å¾®ä¿¡æŽˆæƒ
    let getSystemDictData = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/other/getSystemDictData', { params });    // æŸ¥è¯¢å­—典值数据
    let getProblemsVO = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/problem/getProblemsVO', { params });    // èŽ·å–题目数据
    let finishAnswer = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/problem/finishAnswer', data);    // ä¿®æ”¹å½“前登录的用户信息
    let deviceRoleList = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/other/deviceRoleList', { params });    // è®¾å¤‡ç»„列表
    let getVisitedMember = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/visitor/getVisitedMember', data);    // æŸ¥è¯¢è¢«è®¿é—®äººä¿¡æ¯
    let createFk = (data = {}) => vm.$u.http.post('visitsAdmin/cloudService/web/visitor/createFk', data);    // è®¿å®¢è®°å½•æäº¤
    let detail = (params = {}) => vm.$u.http.get('visitsAdmin/cloudService/web/visitor/detail', { params });    // è®¿å®¢è®°å½•è¯¦æƒ…
    
    vm.$u.api = {
        wxAuthorize,

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/InternalWebController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/visit/InternalWebController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.cloud.web.visit;
package com.doumee.cloud.web;

import com.doumee.cloud.web.ApiController;
import com.doumee.config.annotation.LoginNoRequired;
@@ -34,7 +34,7 @@
@Api(tags = "【公众号】内部劳务人员")
@Trace(exclude = true)
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visit/member")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/member")
@Slf4j
@LoginNoRequired
public class InternalWebController extends ApiController {

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/ProblemWebController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/visit/ProblemWebController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.cloud.web.visit;
package com.doumee.cloud.web;

import com.doumee.cloud.web.ApiController;
import com.doumee.config.annotation.LoginNoRequired;
@@ -31,7 +31,7 @@
@Trace(exclude = true)
@RestController
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visit/problem")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/problem")
@Slf4j
public class ProblemWebController extends ApiController {


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/UnitWebController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/visit/UnitWebController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.cloud.web.visit;
package com.doumee.cloud.web;

import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.config.annotation.LoginNoRequired;
@@ -32,7 +32,7 @@
@Trace(exclude = true)
@RestController
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visit/other")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/other")
@Slf4j
public class UnitWebController {


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/VisitorWebController.java

ÎļþÃû´Ó server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/visit/VisitorWebController.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.doumee.cloud.web.visit;
package com.doumee.cloud.web;

import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
@@ -32,7 +32,7 @@
@Trace(exclude = true)
@RestController
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visit/visitor")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visitor")
@Slf4j
public class VisitorWebController {


 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/WebPublicController.java

@@ -41,7 +41,7 @@
@Trace(exclude = true)
@RestController
@LoginNoRequired
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/visit/public")
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/public")
@Slf4j
public class WebPublicController extends BaseController {


 server/visits/dmvisit_web/pom.xml

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/InterfaceApplication.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/BaseController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/common/CaptchaController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/ApiController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/InternalController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/ProblemController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/PublicController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/UnitController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/api/web/VisitorController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroAuthFilter.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroCache.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroCacheManager.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroConfig.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroCredentialsMatcher.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroRealm.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroSessionDAO.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroSessionManager.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/shiro/ShiroTokenManager.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/swagger/SwaggerConfig.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/swagger/SwaggerInterceptor.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/java/com/doumee/config/swagger/SwaggerInterceptorConfig.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_web/src/main/resources/application.yml

ÎļþÒÑɾ³ý

 server/visits/pom.xml

@@ -14,7 +14,6 @@
       <module>dmvisit_admin</module>
       <module>dmvisit_service</module>
       <module>dmvisit_screen</module>
       <module>dmvisit_web</module>
       <module>openapi</module>
       <module>admin_timer</module>
   </modules>