代码修改

common/common-util/src/main/java/com/yihu/jw/util/date/Date8Util.java

@@ -1224,9 +1224,10 @@ public class Date8Util {
     * @return返回短时间格式 yyyy-MM-dd
     */
    public static Date getDateShort(Date date) {
        SimpleDateFormat formatter = new SimpleDateFormat(YYYY_MM_DD);
        String dateString = formatter.format(date);
        return strToDate(dateString, YYYY_MM_DD);
        LocalDate localDate = dateToLocalDate(date);
        LocalTime localTime = LocalTime.of(0,0,0);
        LocalDateTime localDateTime = LocalDateTime.of(localDate,localTime);
        return Date.from(localDateTime.atZone(zone).toInstant());
    }
    /**
@@ -1260,10 +1261,8 @@ public class Date8Util {
     * @return
     */
    public static int getWeekByDate(Date date){
        Calendar c = Calendar.getInstance();
        c.setTime(date);
        int week = c.get(Calendar.DAY_OF_WEEK);
        return week;
        LocalDate localDate = dateToLocalDate(date);
        return localDate.getDayOfWeek().getValue()+1;
    }
    /**
@@ -1271,13 +1270,10 @@ public class Date8Util {
     * @return
     */
    public static Date getDateStart(){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(new Date());
        calendar.set(Calendar.HOUR_OF_DAY, 0);
        calendar.set(Calendar.MINUTE, 0);
        calendar.set(Calendar.SECOND, 0);
        Date zero = calendar.getTime();
        return zero;
        LocalDate localDate = LocalDate.now();
        LocalTime localTime = LocalTime.of(0,0,0);
        LocalDateTime localDateTime = LocalDateTime.of(localDate,localTime);
        return Date.from(localDateTime.atZone(zone).toInstant());
    }
    /**
@@ -1285,13 +1281,10 @@ public class Date8Util {
     * @return
     */
    public static Date getDateEnd(){
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(new Date());
        calendar.set(Calendar.HOUR_OF_DAY, 23);
        calendar.set(Calendar.MINUTE, 59);
        calendar.set(Calendar.SECOND, 59);
        Date zero = calendar.getTime();
        return zero;
        LocalDate localDate = LocalDate.now();
        LocalTime localTime = LocalTime.of(23,59,59);
        LocalDateTime localDateTime = LocalDateTime.of(localDate,localTime);
        return Date.from(localDateTime.atZone(zone).toInstant());
    }
@@ -1540,13 +1533,6 @@ public class Date8Util {
        return weekDays[getWeekByString(date)];
    }
    public static void main(String[] args) {
        String date = "2022-09-05";
        System.out.println(getWeekByString(date));
    }
//    public static void main(String[] args) {
//        // date与instant的相互转化 -- start
//        Instant now = Instant.now();

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -10,6 +10,7 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.concurrent.TimeUnit;
@@ -1404,14 +1405,12 @@ public class DateUtil {
    }
    public static void main(String[] args) {
        String time = DateUtil.getStringDateShort()+" 09:00:00";
        Date timeDate = DateUtil.strToDate(time);
        System.out.println(dateToChineseTime2(timeDate));
        Date dateStart = getDateStart();
        Date dateEnd = getDateEnd();
        System.out.println(dateStart );
        System.out.println(dateEnd);
        Calendar c = Calendar.getInstance();
        int week = c.get(Calendar.DAY_OF_WEEK);
        System.out.println(week);
        LocalDate localDate = LocalDate.now();
        System.out.println(localDate.getDayOfWeek().getValue());
    }
    
    /**

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/PortalMessageTemplateService.java

@@ -25,11 +25,7 @@ public class PortalMessageTemplateService extends BaseJpaService<PortalMessageTe
    @Autowired
    private PortalMessageTemplateDao portalMessageTemplateRepository;
    /**
     * 应用ID
     */
    @Value("${h5.clientId}")
    public String clientId;
    public List<PortalMessageTemplate> getMessageTemplate(String classification,String type,String state) {
        return portalMessageTemplateRepository.searchPortalMessageTemplate(classification,type,state);

svr/svr-basic/src/main/java/com/yihu/jw/basic/user/controller/UserEndPoint.java

@@ -69,14 +69,10 @@ public class UserEndPoint extends EnvelopRestEndpoint {
    @Value("${default.password}")
    private String default_password = "12345678";
    @Value("${h5.secret}")
    private String secret;
    @Value("${h5.appId}")
    private String appId;
    @Value("${jksr-app.orgcode}")
    private String orgcode;
    @Value("${jksr-app.registerRoleClientId}")
    public String registerRoleClientId;
    private String secret="";
    private String appId="";
    private String orgcode="";
    public String registerRoleClientId="";
    @Autowired
    private UserService userService;
    @Autowired

svr/svr-basic/src/main/resources/application.yml

@@ -1,5 +1,5 @@
server:
  port: ${server.svr-basic-port}
  port: 10030
info:
  app:
@@ -54,7 +54,25 @@ hadoop:
    zookeeper.znode.parent: /hbase-unsecure
  user:
    name: root
# 上传文件临时路径配置
FileTempPath:
  upload_temp_path : /var/local/temp
  image_path : /var/local/upload/images
  voice_path : /var/local/upload/voice
  chat_file_path : /var/local/upload/chat
default:
  password: 123456
eureka:
  client:
    healthcheck:
      enabled: false
    serviceUrl:
      defaultZone: http://jw:jkzl@172.26.0.153:8761/eureka/
  instance:
    prefer-ip-address: false
    instance-id: ${spring.cloud.client.ip-address}:10030
---
spring:
  profiles: dev
@@ -146,24 +164,46 @@ spring:
fastDFS:
  fastdfs_file_url: http://127.0.0.1:8888/
fast-dfs:
  tracker-server: 127.0.0.1:22122 #服务器地址
  tracker-server: 172.26.0.200:22122
  public-server: http://172.26.0.200:80
elasticsearch:
  cluster-name: elasticsearch
  cluster-nodes: 172.26.0.56:9300
deploy:
  region: 3502
es:
  index: wlyy_quota_test
  type: wlyy_quota_test
  host: http://172.19.103.68:9200
  tHost: 172.19.103.68:9300
  pwflag: 1 # 1需要密码，2不需要密码
  index:
    Statistics: hlw_quota_test
  type:
    Statistics: hlw_quota_test
  host:  http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
  clusterName: jkzl
h5:
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
  appId: 9000401
  clientId: WYo0l73F8e
#福州总部网关参数配置
fz-gateway:
  url: http://172.19.103.73:10001/fzGateway/WSGW/rest
  clientId: 9000401
  clientVersion: 1.0
  secret: KU5XTORDKZI3O86YAT3ABCNJW2XTL1DJYF3GKU3ICXL
  handlerId: 50871
hadoop:
  hbase-properties:
    hbase.zookeeper.quorum: node1.hde.h3c.com,node2.hde.h3c.com,node3.hde.h3c.com
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wechat:
  id: xm_mlw_wx  # base库中,wx_wechat 的id字段
  flag: false #演示环境  true走Mysql数据库  false走Oracle
  url: http://172.16.100.37:8090/hospitalPortal-sms/sms/sendMessage
wlyy:
  url: http://
demo:
  flag: true
#支付支付
pay:
  flag: true
hospital:
  url: https://wx.xmzsh.com
  mqUser: JKZL
  mqPwd: 123456
  SourceSysCode: S60
  TargetSysCode: S01
express:
  sf_url: https://mr
  sf_code: JKZL
  sf_check_word: Qke
im:
  im_list_get: http://172.26.0.105:3000/
  data_base_name: im_internet_hospital

svr/svr-basic/src/main/resources/bootstrap.yml

@@ -3,8 +3,9 @@ spring:
    name: svr-basic
  cloud:
    config:
      username: user
      password: configuration
      failFast: true
      username: jw
      password: jkzl
---
spring:
@@ -27,6 +28,6 @@ spring:
  profiles: mlwTest
  cloud:
    config:
      uri: ${spring.config.uri:http://172.26.0.125:1221}
      uri: ${spring.config.uri:http://172.26.0.153:1221}
      label: ${spring.config.label:dev}